3570 files changed, 12522 insertions, 11884 deletions

diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 1750f277d6b..4f66f5d2e80 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -14277,6 +14277,84 @@
      {}
     ]
    ],
+   "native-file-system/native_FileSystemBaseHandle-postMessage-BroadcastChannel-manual.https.tentative.html": [
+    [
+     "native-file-system/native_FileSystemBaseHandle-postMessage-BroadcastChannel-manual.https.tentative.html",
+     {}
+    ]
+   ],
+   "native-file-system/native_FileSystemBaseHandle-postMessage-Error-manual.https.tentative.html": [
+    [
+     "native-file-system/native_FileSystemBaseHandle-postMessage-Error-manual.https.tentative.html",
+     {}
+    ]
+   ],
+   "native-file-system/native_FileSystemBaseHandle-postMessage-MessagePort-manual.https.tentative.html": [
+    [
+     "native-file-system/native_FileSystemBaseHandle-postMessage-MessagePort-manual.https.tentative.html",
+     {}
+    ]
+   ],
+   "native-file-system/native_FileSystemBaseHandle-postMessage-manual.https.tentative.html": [
+    [
+     "native-file-system/native_FileSystemBaseHandle-postMessage-manual.https.tentative.html",
+     {}
+    ]
+   ],
+   "native-file-system/native_FileSystemDirectoryHandle-getDirectory-manual.https.tentative.html": [
+    [
+     "native-file-system/native_FileSystemDirectoryHandle-getDirectory-manual.https.tentative.html",
+     {}
+    ]
+   ],
+   "native-file-system/native_FileSystemDirectoryHandle-getEntries-manual.https.tentative.html": [
+    [
+     "native-file-system/native_FileSystemDirectoryHandle-getEntries-manual.https.tentative.html",
+     {}
+    ]
+   ],
+   "native-file-system/native_FileSystemDirectoryHandle-getFile-manual.https.tentative.html": [
+    [
+     "native-file-system/native_FileSystemDirectoryHandle-getFile-manual.https.tentative.html",
+     {}
+    ]
+   ],
+   "native-file-system/native_FileSystemDirectoryHandle-removeEntry-manual.https.tentative.html": [
+    [
+     "native-file-system/native_FileSystemDirectoryHandle-removeEntry-manual.https.tentative.html",
+     {}
+    ]
+   ],
+   "native-file-system/native_FileSystemFileHandle-getFile-manual.https.tentative.html": [
+    [
+     "native-file-system/native_FileSystemFileHandle-getFile-manual.https.tentative.html",
+     {}
+    ]
+   ],
+   "native-file-system/native_FileSystemWritableFileStream-manual.https.tentative.html": [
+    [
+     "native-file-system/native_FileSystemWritableFileStream-manual.https.tentative.html",
+     {}
+    ]
+   ],
+   "native-file-system/native_FileSystemWritableFileStream-piped-manual.https.tentative.html": [
+    [
+     "native-file-system/native_FileSystemWritableFileStream-piped-manual.https.tentative.html",
+     {}
+    ]
+   ],
+   "native-file-system/native_FileSystemWritableFileStream-write-manual.https.tentative.html": [
+    [
+     "native-file-system/native_FileSystemWritableFileStream-write-manual.https.tentative.html",
+     {}
+    ]
+   ],
+   "native-file-system/native_FileSystemWriter-manual.https.tentative.html": [
+    [
+     "native-file-system/native_FileSystemWriter-manual.https.tentative.html",
+     {}
+    ]
+   ],
    "notifications/body-basic-manual.html": [
     [
      "notifications/body-basic-manual.html",
@@ -273542,6 +273620,12 @@
    "html/cross-origin-opener-policy/README.md": [
     []
    ],
+   "html/cross-origin-opener-policy/blob-popup.https.html.headers": [
+    []
+   ],
+   "html/cross-origin-opener-policy/coep-blob-popup.https.html.headers": [
+    []
+   ],
    "html/cross-origin-opener-policy/coep-navigate-popup.https.html.headers": [
     []
    ],
@@ -273584,6 +273668,15 @@
    "html/cross-origin-opener-policy/historical/popup-same-site-with-same-site.https.html.headers": [
     []
    ],
+   "html/cross-origin-opener-policy/iframe-popup-same-origin-allow-popups.https.html.headers": [
+    []
+   ],
+   "html/cross-origin-opener-policy/iframe-popup-same-origin.https.html.headers": [
+    []
+   ],
+   "html/cross-origin-opener-policy/iframe-popup-unsafe-none.https.html.headers": [
+    []
+   ],
    "html/cross-origin-opener-policy/no-https.html.headers": [
     []
    ],
@@ -273626,6 +273719,9 @@
    "html/cross-origin-opener-policy/resources/coop-coep.py": [
     []
    ],
+   "html/cross-origin-opener-policy/resources/iframe-popup.sub.html": [
+    []
+   ],
    "html/cross-origin-opener-policy/resources/postback.html": [
     []
    ],
@@ -279476,6 +279572,39 @@
    "import-maps/common/resources/packages-via-trailing-slashes.json": [
     []
    ],
+   "import-maps/common/resources/parsing-addresses-absolute.json": [
+    []
+   ],
+   "import-maps/common/resources/parsing-addresses-invalid.json": [
+    []
+   ],
+   "import-maps/common/resources/parsing-addresses.json": [
+    []
+   ],
+   "import-maps/common/resources/parsing-invalid-json.json": [
+    []
+   ],
+   "import-maps/common/resources/parsing-schema-normalization.json": [
+    []
+   ],
+   "import-maps/common/resources/parsing-schema-scope.json": [
+    []
+   ],
+   "import-maps/common/resources/parsing-schema-specifier-map.json": [
+    []
+   ],
+   "import-maps/common/resources/parsing-schema-toplevel.json": [
+    []
+   ],
+   "import-maps/common/resources/parsing-scope-keys.json": [
+    []
+   ],
+   "import-maps/common/resources/parsing-specifier-keys.json": [
+    []
+   ],
+   "import-maps/common/resources/parsing-trailing-slashes.json": [
+    []
+   ],
    "import-maps/common/resources/scopes-exact-vs-prefix.json": [
     []
    ],
@@ -279509,21 +279638,6 @@
    "import-maps/core/static-import.py": [
     []
    ],
-   "import-maps/imported/resources/helpers/parsing.js": [
-    []
-   ],
-   "import-maps/imported/resources/parsing-addresses.js": [
-    []
-   ],
-   "import-maps/imported/resources/parsing-schema.js": [
-    []
-   ],
-   "import-maps/imported/resources/parsing-scope-keys.js": [
-    []
-   ],
-   "import-maps/imported/resources/parsing-specifier-keys.js": [
-    []
-   ],
    "import-maps/resources/empty.js": [
     []
    ],
@@ -329688,6 +329802,12 @@
      {}
     ]
    ],
+   "css/css-pseudo/marker-computed-size.html": [
+    [
+     "css/css-pseudo/marker-computed-size.html",
+     {}
+    ]
+   ],
    "css/css-pseudo/marker-default-styles.html": [
     [
      "css/css-pseudo/marker-default-styles.html",
@@ -330644,6 +330764,12 @@
      {}
     ]
    ],
+   "css/css-shadow-parts/serialization.html": [
+    [
+     "css/css-shadow-parts/serialization.html",
+     {}
+    ]
+   ],
    "css/css-shadow-parts/simple-forward-shorthand.html": [
     [
      "css/css-shadow-parts/simple-forward-shorthand.html",
@@ -362171,6 +362297,18 @@
      {}
     ]
    ],
+   "html/cross-origin-opener-policy/blob-popup.https.html": [
+    [
+     "html/cross-origin-opener-policy/blob-popup.https.html",
+     {}
+    ]
+   ],
+   "html/cross-origin-opener-policy/coep-blob-popup.https.html": [
+    [
+     "html/cross-origin-opener-policy/coep-blob-popup.https.html",
+     {}
+    ]
+   ],
    "html/cross-origin-opener-policy/coep-navigate-popup.https.html": [
     [
      "html/cross-origin-opener-policy/coep-navigate-popup.https.html",
@@ -362269,6 +362407,24 @@
      {}
     ]
    ],
+   "html/cross-origin-opener-policy/iframe-popup-same-origin-allow-popups.https.html": [
+    [
+     "html/cross-origin-opener-policy/iframe-popup-same-origin-allow-popups.https.html",
+     {}
+    ]
+   ],
+   "html/cross-origin-opener-policy/iframe-popup-same-origin.https.html": [
+    [
+     "html/cross-origin-opener-policy/iframe-popup-same-origin.https.html",
+     {}
+    ]
+   ],
+   "html/cross-origin-opener-policy/iframe-popup-unsafe-none.https.html": [
+    [
+     "html/cross-origin-opener-policy/iframe-popup-unsafe-none.https.html",
+     {}
+    ]
+   ],
    "html/cross-origin-opener-policy/no-https.html": [
     [
      "html/cross-origin-opener-policy/no-https.html",
@@ -375231,6 +375387,14 @@
      {}
     ]
    ],
+   "import-maps/common/parsing.tentative.html": [
+    [
+     "import-maps/common/parsing.tentative.html",
+     {
+      "timeout": "long"
+     }
+    ]
+   ],
    "import-maps/common/resolving.tentative.html": [
     [
      "import-maps/common/resolving.tentative.html",
@@ -375315,30 +375479,6 @@
      {}
     ]
    ],
-   "import-maps/imported/parsing-addresses.tentative.html": [
-    [
-     "import-maps/imported/parsing-addresses.tentative.html",
-     {}
-    ]
-   ],
-   "import-maps/imported/parsing-schema.tentative.html": [
-    [
-     "import-maps/imported/parsing-schema.tentative.html",
-     {}
-    ]
-   ],
-   "import-maps/imported/parsing-scope-keys.tentative.html": [
-    [
-     "import-maps/imported/parsing-scope-keys.tentative.html",
-     {}
-    ]
-   ],
-   "import-maps/imported/parsing-specifier-keys.tentative.html": [
-    [
-     "import-maps/imported/parsing-specifier-keys.tentative.html",
-     {}
-    ]
-   ],
    "inert/inert-does-not-match-disabled-selector.tentative.html": [
     [
      "inert/inert-does-not-match-disabled-selector.tentative.html",
@@ -381652,379 +381792,6 @@
      }
     ]
    ],
-   "native-file-system/native_FileSystemBaseHandle-postMessage-BroadcastChannel.tentative.https.manual.window.js": [
-    [
-     "native-file-system/native_FileSystemBaseHandle-postMessage-BroadcastChannel.tentative.https.manual.window.html",
-     {
-      "script_metadata": [
-       [
-        "script",
-        "/service-workers/service-worker/resources/test-helpers.sub.js"
-       ],
-       [
-        "script",
-        "resources/test-helpers.js"
-       ],
-       [
-        "script",
-        "resources/native-fs-test-helpers.js"
-       ],
-       [
-        "script",
-        "resources/messaging-helpers.js"
-       ],
-       [
-        "script",
-        "resources/messaging-serialize-helpers.js"
-       ],
-       [
-        "script",
-        "script-tests/FileSystemBaseHandle-postMessage-BroadcastChannel.js"
-       ]
-      ]
-     }
-    ]
-   ],
-   "native-file-system/native_FileSystemBaseHandle-postMessage-Error.tentative.https.manual.window.js": [
-    [
-     "native-file-system/native_FileSystemBaseHandle-postMessage-Error.tentative.https.manual.window.html",
-     {
-      "script_metadata": [
-       [
-        "script",
-        "/common/get-host-info.sub.js"
-       ],
-       [
-        "script",
-        "/service-workers/service-worker/resources/test-helpers.sub.js"
-       ],
-       [
-        "script",
-        "resources/test-helpers.js"
-       ],
-       [
-        "script",
-        "resources/native-fs-test-helpers.js"
-       ],
-       [
-        "script",
-        "resources/messaging-helpers.js"
-       ],
-       [
-        "script",
-        "resources/messaging-blob-helpers.js"
-       ],
-       [
-        "script",
-        "resources/messaging-serialize-helpers.js"
-       ],
-       [
-        "script",
-        "script-tests/FileSystemBaseHandle-postMessage-Error.js"
-       ]
-      ]
-     }
-    ]
-   ],
-   "native-file-system/native_FileSystemBaseHandle-postMessage-MessagePort.tentative.https.manual.window.js": [
-    [
-     "native-file-system/native_FileSystemBaseHandle-postMessage-MessagePort.tentative.https.manual.window.html",
-     {
-      "script_metadata": [
-       [
-        "script",
-        "/service-workers/service-worker/resources/test-helpers.sub.js"
-       ],
-       [
-        "script",
-        "resources/test-helpers.js"
-       ],
-       [
-        "script",
-        "resources/native-fs-test-helpers.js"
-       ],
-       [
-        "script",
-        "resources/messaging-helpers.js"
-       ],
-       [
-        "script",
-        "resources/messaging-blob-helpers.js"
-       ],
-       [
-        "script",
-        "resources/messaging-serialize-helpers.js"
-       ],
-       [
-        "script",
-        "script-tests/FileSystemBaseHandle-postMessage-MessagePort.js"
-       ]
-      ]
-     }
-    ]
-   ],
-   "native-file-system/native_FileSystemBaseHandle-postMessage.tentative.https.manual.window.js": [
-    [
-     "native-file-system/native_FileSystemBaseHandle-postMessage.tentative.https.manual.window.html",
-     {
-      "script_metadata": [
-       [
-        "script",
-        "/service-workers/service-worker/resources/test-helpers.sub.js"
-       ],
-       [
-        "script",
-        "resources/test-helpers.js"
-       ],
-       [
-        "script",
-        "resources/native-fs-test-helpers.js"
-       ],
-       [
-        "script",
-        "resources/messaging-helpers.js"
-       ],
-       [
-        "script",
-        "resources/messaging-blob-helpers.js"
-       ],
-       [
-        "script",
-        "resources/messaging-serialize-helpers.js"
-       ],
-       [
-        "script",
-        "script-tests/FileSystemBaseHandle-postMessage.js"
-       ]
-      ]
-     }
-    ]
-   ],
-   "native-file-system/native_FileSystemDirectoryHandle-getDirectory.tentative.https.manual.window.js": [
-    [
-     "native-file-system/native_FileSystemDirectoryHandle-getDirectory.tentative.https.manual.window.html",
-     {
-      "script_metadata": [
-       [
-        "script",
-        "/resources/testdriver.js"
-       ],
-       [
-        "script",
-        "resources/test-helpers.js"
-       ],
-       [
-        "script",
-        "resources/native-fs-test-helpers.js"
-       ],
-       [
-        "script",
-        "script-tests/FileSystemDirectoryHandle-getDirectory.js"
-       ]
-      ]
-     }
-    ]
-   ],
-   "native-file-system/native_FileSystemDirectoryHandle-getEntries.tentative.https.manual.window.js": [
-    [
-     "native-file-system/native_FileSystemDirectoryHandle-getEntries.tentative.https.manual.window.html",
-     {
-      "script_metadata": [
-       [
-        "script",
-        "/resources/testdriver.js"
-       ],
-       [
-        "script",
-        "resources/test-helpers.js"
-       ],
-       [
-        "script",
-        "resources/native-fs-test-helpers.js"
-       ],
-       [
-        "script",
-        "script-tests/FileSystemDirectoryHandle-getEntries.js"
-       ]
-      ]
-     }
-    ]
-   ],
-   "native-file-system/native_FileSystemDirectoryHandle-getFile.tentative.https.manual.window.js": [
-    [
-     "native-file-system/native_FileSystemDirectoryHandle-getFile.tentative.https.manual.window.html",
-     {
-      "script_metadata": [
-       [
-        "script",
-        "/resources/testdriver.js"
-       ],
-       [
-        "script",
-        "resources/test-helpers.js"
-       ],
-       [
-        "script",
-        "resources/native-fs-test-helpers.js"
-       ],
-       [
-        "script",
-        "script-tests/FileSystemDirectoryHandle-getFile.js"
-       ]
-      ]
-     }
-    ]
-   ],
-   "native-file-system/native_FileSystemDirectoryHandle-removeEntry.tentative.https.manual.window.js": [
-    [
-     "native-file-system/native_FileSystemDirectoryHandle-removeEntry.tentative.https.manual.window.html",
-     {
-      "script_metadata": [
-       [
-        "script",
-        "/resources/testdriver.js"
-       ],
-       [
-        "script",
-        "resources/test-helpers.js"
-       ],
-       [
-        "script",
-        "resources/native-fs-test-helpers.js"
-       ],
-       [
-        "script",
-        "script-tests/FileSystemDirectoryHandle-removeEntry.js"
-       ]
-      ]
-     }
-    ]
-   ],
-   "native-file-system/native_FileSystemFileHandle-getFile.tentative.https.manual.window.js": [
-    [
-     "native-file-system/native_FileSystemFileHandle-getFile.tentative.https.manual.window.html",
-     {
-      "script_metadata": [
-       [
-        "script",
-        "/resources/testdriver.js"
-       ],
-       [
-        "script",
-        "resources/test-helpers.js"
-       ],
-       [
-        "script",
-        "resources/native-fs-test-helpers.js"
-       ],
-       [
-        "script",
-        "script-tests/FileSystemFileHandle-getFile.js"
-       ]
-      ]
-     }
-    ]
-   ],
-   "native-file-system/native_FileSystemWritableFileStream-piped.tentative.https.manual.window.js": [
-    [
-     "native-file-system/native_FileSystemWritableFileStream-piped.tentative.https.manual.window.html",
-     {
-      "script_metadata": [
-       [
-        "script",
-        "/resources/testdriver.js"
-       ],
-       [
-        "script",
-        "resources/test-helpers.js"
-       ],
-       [
-        "script",
-        "resources/native-fs-test-helpers.js"
-       ],
-       [
-        "script",
-        "script-tests/FileSystemWritableFileStream-piped.js"
-       ]
-      ]
-     }
-    ]
-   ],
-   "native-file-system/native_FileSystemWritableFileStream-write.tentative.https.manual.window.js": [
-    [
-     "native-file-system/native_FileSystemWritableFileStream-write.tentative.https.manual.window.html",
-     {
-      "script_metadata": [
-       [
-        "script",
-        "/resources/testdriver.js"
-       ],
-       [
-        "script",
-        "resources/test-helpers.js"
-       ],
-       [
-        "script",
-        "resources/native-fs-test-helpers.js"
-       ],
-       [
-        "script",
-        "script-tests/FileSystemWritableFileStream-write.js"
-       ]
-      ]
-     }
-    ]
-   ],
-   "native-file-system/native_FileSystemWritableFileStream.tentative.https.manual.window.js": [
-    [
-     "native-file-system/native_FileSystemWritableFileStream.tentative.https.manual.window.html",
-     {
-      "script_metadata": [
-       [
-        "script",
-        "/resources/testdriver.js"
-       ],
-       [
-        "script",
-        "resources/test-helpers.js"
-       ],
-       [
-        "script",
-        "resources/native-fs-test-helpers.js"
-       ],
-       [
-        "script",
-        "script-tests/FileSystemWritableFileStream.js"
-       ]
-      ]
-     }
-    ]
-   ],
-   "native-file-system/native_FileSystemWriter.tentative.https.manual.window.js": [
-    [
-     "native-file-system/native_FileSystemWriter.tentative.https.manual.window.html",
-     {
-      "script_metadata": [
-       [
-        "script",
-        "/resources/testdriver.js"
-       ],
-       [
-        "script",
-        "resources/test-helpers.js"
-       ],
-       [
-        "script",
-        "resources/native-fs-test-helpers.js"
-       ],
-       [
-        "script",
-        "script-tests/FileSystemWriter.js"
-       ]
-      ]
-     }
-    ]
-   ],
    "native-file-system/opaque-origin.https.window.js": [
     [
      "native-file-system/opaque-origin.https.window.html",
@@ -431367,9 +431134,9 @@
      {}
     ]
    ],
-   "web-nfc/NDEFWriter_push.https.html": [
+   "web-nfc/NDEFWriter_write.https.html": [
     [
-     "web-nfc/NDEFWriter_push.https.html",
+     "web-nfc/NDEFWriter_write.https.html",
      {}
     ]
    ],
@@ -476802,7 +476569,7 @@
    "testharness"
   ],
   "client-hints/accept-ch-stickiness/resources/accept-ch-test.js": [
-   "ed635513fd70f20ec2c5b51fd88a4b0380b77190",
+   "0ee5059cb677090c65cdb8b5cade69df7578f901",
    "support"
   ],
   "client-hints/accept-ch-stickiness/resources/accept-ch.html": [
@@ -476810,7 +476577,7 @@
    "support"
   ],
   "client-hints/accept-ch-stickiness/resources/accept-ch.html.headers": [
-   "370f9869226db4bdf8785c876b13d69b415e5abf",
+   "3f073bfe613cef20e7d9e99761f68ee732bc8802",
    "support"
   ],
   "client-hints/accept-ch-stickiness/resources/clear-site-data.html": [
@@ -477258,7 +477025,7 @@
    "support"
   ],
   "common/security-features/tools/generate.py": [
-   "3c298b5a3e20216f822b420d3460e1bea48e22d5",
+   "ba997067b3f44640fec79fac9cea10a79ae982af",
    "support"
   ],
   "common/security-features/tools/spec_validator.py": [
@@ -477282,7 +477049,7 @@
    "support"
   ],
   "common/security-features/tools/util.py": [
-   "269f464a547c7d1d23ba88527a55b9767e814304",
+   "f31029644ddf0e356735f88450d9200238e6737c",
    "support"
   ],
   "common/slow.py": [
@@ -497694,7 +497461,7 @@
    "support"
   ],
   "content-security-policy/support/checkReport.sub.js": [
-   "1ecfa5f52c481cf3ba98236bc21104b33fcdac84",
+   "3137b926ae8bf41ec37a183e1b6e3be70f5a1143",
    "support"
   ],
   "content-security-policy/support/dedicated-worker-helper.js": [
@@ -561766,7 +561533,7 @@
    "testharness"
   ],
   "css/css-animations/keyframes-remove-documentElement-crash.html": [
-   "aba7f9c6edd71d4a2b9446fb6de890866c41da64",
+   "9573ce1b0f8d1a413c0fb609207c5d98350053d6",
    "crashtest"
   ],
   "css/css-animations/parsing/animation-computed.html": [
@@ -593825,6 +593592,10 @@
    "d45c76696eca826456988d7884adcaa52bfad9cd",
    "reftest"
   ],
+  "css/css-pseudo/marker-computed-size.html": [
+   "76851369ab56b7d4eea9c38339f087092ce22f26",
+   "testharness"
+  ],
   "css/css-pseudo/marker-content-001-ref.html": [
    "e2c2daa1761563dc6b74ac3bc1bd0de05ff3766a",
    "support"
@@ -597701,6 +597472,10 @@
    "9905cf8b5e46b51dc21326dc31f8c2bc6d7a39b6",
    "testharness"
   ],
+  "css/css-shadow-parts/serialization.html": [
+   "50ad3df53a33a3c3ae24d4130356619c8d02d182",
+   "testharness"
+  ],
   "css/css-shadow-parts/simple-forward-shorthand.html": [
    "0142967dfdb707a376b86e5347465117033cda01",
    "testharness"
@@ -627758,7 +627533,7 @@
    "testharness"
   ],
   "css/cssom/selectorSerialize.html": [
-   "e95f453ba1c9494d5ff9bc3a602217106fc5174a",
+   "f3a402f5f079fd33683e44157a996df7daa4eec0",
    "testharness"
   ],
   "css/cssom/selectorText-modification-restyle-001-ref.html": [
@@ -631806,7 +631581,7 @@
    "testharness"
   ],
   "css/selectors/webkit-pseudo-element.html": [
-   "8b4adddba8f2797512791421910ded22c00c8be2",
+   "5ba98eba21b60e1efa364a8c98dfd0da1983316f",
    "testharness"
   ],
   "css/selectors/x-pseudo-element.html": [
@@ -642078,7 +641853,7 @@
    "support"
   ],
   "docs/writing-tests/crashtest.md": [
-   "e20e5036edec604fec5ef225b0838bf329f33465",
+   "76ae46b1e592762f5b8561e7041eca336a14c8d0",
    "support"
   ],
   "docs/writing-tests/css-metadata.md": [
@@ -654718,7 +654493,7 @@
    "support"
   ],
   "html/cross-origin-embedder-policy/blob.https.html": [
-   "aa4cf969d9e0fe369ce812896e6eb8d13cb02377",
+   "77af2bc77de3301bcee344cdfbec6b5761c2e89f",
    "testharness"
   ],
   "html/cross-origin-embedder-policy/blob.https.html.headers": [
@@ -654885,6 +654660,22 @@
    "3f080c82d25de71d899d3b3011afcc3c553fb2a2",
    "support"
   ],
+  "html/cross-origin-opener-policy/blob-popup.https.html": [
+   "4aef1b848917c1f2901eb696a39d5d7f1369a063",
+   "testharness"
+  ],
+  "html/cross-origin-opener-policy/blob-popup.https.html.headers": [
+   "46ad58d83bf6e98913ca4c564b7acb8f19fa0093",
+   "support"
+  ],
+  "html/cross-origin-opener-policy/coep-blob-popup.https.html": [
+   "c66988d0a659b1c0cf00bd88e06f3b2c3dded975",
+   "testharness"
+  ],
+  "html/cross-origin-opener-policy/coep-blob-popup.https.html.headers": [
+   "63b60e490f47f4db77d33d7a4ca2f5b9a4181de8",
+   "support"
+  ],
   "html/cross-origin-opener-policy/coep-navigate-popup.https.html": [
    "faa2793e5faaa81d4d819110ec1045dac9d9cde0",
    "testharness"
@@ -655005,6 +654796,30 @@
    "34bd099a302f893f92586241ea38aac812bf28d0",
    "support"
   ],
+  "html/cross-origin-opener-policy/iframe-popup-same-origin-allow-popups.https.html": [
+   "0c33b40b181b6f6258614e8f30794926d61ddf6b",
+   "testharness"
+  ],
+  "html/cross-origin-opener-policy/iframe-popup-same-origin-allow-popups.https.html.headers": [
+   "d83ed86fb9b5d159b9f380424887402edc96cb75",
+   "support"
+  ],
+  "html/cross-origin-opener-policy/iframe-popup-same-origin.https.html": [
+   "2b7decd39cf8861b59788003d64bf84ce48ff984",
+   "testharness"
+  ],
+  "html/cross-origin-opener-policy/iframe-popup-same-origin.https.html.headers": [
+   "46ad58d83bf6e98913ca4c564b7acb8f19fa0093",
+   "support"
+  ],
+  "html/cross-origin-opener-policy/iframe-popup-unsafe-none.https.html": [
+   "78a18118504bb9ad9a52b25bfc12059721708dd9",
+   "testharness"
+  ],
+  "html/cross-origin-opener-policy/iframe-popup-unsafe-none.https.html.headers": [
+   "073ce7adfbd81cb7c0b2f91f96c8349b6677f26c",
+   "support"
+  ],
   "html/cross-origin-opener-policy/no-https.html": [
    "f4e926b2eb2838c443f2e8f4d3bc024e719039a7",
    "testharness"
@@ -655118,13 +654933,17 @@
    "support"
   ],
   "html/cross-origin-opener-policy/resources/common.js": [
-   "477bc6c948f29cc18dc987e828eb5799b4a946ab",
+   "59ba33d65b04e26c1db810783b7fdcc96dee8954",
    "support"
   ],
   "html/cross-origin-opener-policy/resources/coop-coep.py": [
    "e6f655ab728107e4bac31cd7748711f719b01bd3",
    "support"
   ],
+  "html/cross-origin-opener-policy/resources/iframe-popup.sub.html": [
+   "748fd996cfbb5dceec670033308fa68502d70cb0",
+   "support"
+  ],
   "html/cross-origin-opener-policy/resources/postback.html": [
    "cf3c93bbe1d3589e9a649db34995e02e2ac9c1e4",
    "support"
@@ -671718,7 +671537,7 @@
    "manual"
   ],
   "html/webappapis/scripting/events/event-handler-all-global-events.html": [
-   "caeac8e8a50d29db7b9a50b7cb6069e76f5d7d0b",
+   "ee8c34ced313f5406992a1f3dc02edeba41e4f0e",
    "testharness"
   ],
   "html/webappapis/scripting/events/event-handler-attributes-body-window.html": [
@@ -672682,15 +672501,19 @@
    "support"
   ],
   "import-maps/common/README.md": [
-   "cda42d06099f16f13e61e30394c230cbbb34f8c9",
+   "6092c0d767050d0c1b13cfd2360f7a7f17d656a5",
    "support"
   ],
+  "import-maps/common/parsing.tentative.html": [
+   "d3334d7bbb9b4406397f96b596e71463eb252791",
+   "testharness"
+  ],
   "import-maps/common/resolving.tentative.html": [
    "c947232e06322addc60a08004c1f21d317647042",
    "testharness"
   ],
   "import-maps/common/resources/common-test-helper.js": [
-   "002c4b51fd06a6db7c07344a3267ae72aac8399e",
+   "0ddad9fe150b51f4017ea0ae203749ee299d4f57",
    "support"
   ],
   "import-maps/common/resources/data-base-url.json": [
@@ -672709,6 +672532,50 @@
    "6b8f0135f50f50cd2691b5d4ee801d9671a3a2f9",
    "support"
   ],
+  "import-maps/common/resources/parsing-addresses-absolute.json": [
+   "d392f8224faeb1606193d504188956dc39fadcdf",
+   "support"
+  ],
+  "import-maps/common/resources/parsing-addresses-invalid.json": [
+   "7d6502a1bc485cf66f9cce34f6ba16ed6fa69f52",
+   "support"
+  ],
+  "import-maps/common/resources/parsing-addresses.json": [
+   "d5bb54f0c8073d168798b400667ae4046d3d8a44",
+   "support"
+  ],
+  "import-maps/common/resources/parsing-invalid-json.json": [
+   "1bd1c94e8947a9f5348354a22a67276e93e83ded",
+   "support"
+  ],
+  "import-maps/common/resources/parsing-schema-normalization.json": [
+   "a330bb8799b68e277fbb6b9a202079c84e28d926",
+   "support"
+  ],
+  "import-maps/common/resources/parsing-schema-scope.json": [
+   "04d09395c32dba689c661528224a8a2a12bc128d",
+   "support"
+  ],
+  "import-maps/common/resources/parsing-schema-specifier-map.json": [
+   "926e7a1f5f73cdf0dbe7108e077b6648099314fd",
+   "support"
+  ],
+  "import-maps/common/resources/parsing-schema-toplevel.json": [
+   "278cad2295c12a8bb2b615e118dc2c3785e58cc4",
+   "support"
+  ],
+  "import-maps/common/resources/parsing-scope-keys.json": [
+   "4b2f1eeada92efc78048aabcf91f4fc886b1ace6",
+   "support"
+  ],
+  "import-maps/common/resources/parsing-specifier-keys.json": [
+   "b2d9cf47fa08dac6b009b517775a7854d376ab13",
+   "support"
+  ],
+  "import-maps/common/resources/parsing-trailing-slashes.json": [
+   "21e5faa13ec69c8b9ed70a49fc38940f86a067b3",
+   "support"
+  ],
   "import-maps/common/resources/scopes-exact-vs-prefix.json": [
    "3d9d50349f0d644264ed257eb84854677c55fda6",
    "support"
@@ -672801,42 +672668,6 @@
    "101c33cf84e9fb5e68cf8d5910f4ffbe7949e9d7",
    "testharness"
   ],
-  "import-maps/imported/parsing-addresses.tentative.html": [
-   "ddb3b724bb64e2edd60a620dc6ae1cc98f32a92a",
-   "testharness"
-  ],
-  "import-maps/imported/parsing-schema.tentative.html": [
-   "6b7c0e5b0eb40eee9c8a415af5b1af87a4af3492",
-   "testharness"
-  ],
-  "import-maps/imported/parsing-scope-keys.tentative.html": [
-   "601ac37720d700d3f68e3b2f6aeae3b06c112132",
-   "testharness"
-  ],
-  "import-maps/imported/parsing-specifier-keys.tentative.html": [
-   "dd547f01d1dfb2379f6afa893385fadc8f1217d1",
-   "testharness"
-  ],
-  "import-maps/imported/resources/helpers/parsing.js": [
-   "daad6d26d220bb0241f8a413816bd100f3af580d",
-   "support"
-  ],
-  "import-maps/imported/resources/parsing-addresses.js": [
-   "92d7714ade9b965325372d58775bd990d3a1ce85",
-   "support"
-  ],
-  "import-maps/imported/resources/parsing-schema.js": [
-   "f60422ae62bce21079cee8d6880cba0dc0dddaa5",
-   "support"
-  ],
-  "import-maps/imported/resources/parsing-scope-keys.js": [
-   "4993f3a9a8bac441b883be55b58d40423114beab",
-   "support"
-  ],
-  "import-maps/imported/resources/parsing-specifier-keys.js": [
-   "7ac24bf867b06a6393fbd1ef8e9478d28b2d714d",
-   "support"
-  ],
   "import-maps/resources/empty.js": [
    "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
    "support"
@@ -673826,7 +673657,7 @@
    "support"
   ],
   "interfaces/dom.idl": [
-   "f7a10d890ab892e990bf9a81b87884e54089dcaa",
+   "ad62c7a59c6ef17b64fb2a0ef6b81c3aac0aa0df",
    "support"
   ],
   "interfaces/element-timing.idl": [
@@ -674134,7 +673965,7 @@
    "support"
   ],
   "interfaces/wai-aria.idl": [
-   "9cae4025d822dcaff47dd25b66dafa3c49a29c09",
+   "c4fbf11409cf142d8295038d256f5a686d860a55",
    "support"
   ],
   "interfaces/wake-lock.idl": [
@@ -674194,11 +674025,11 @@
    "support"
   ],
   "interfaces/webrtc-identity.idl": [
-   "d1f2a6547609ed1a9614ace180dd15027eb9c791",
+   "28b6a3b2b7f4acf78fde3889c75d6f8e97c8eb57",
    "support"
   ],
   "interfaces/webrtc-stats.idl": [
-   "c5d00ac4462b24abf046cb05db294503bc90c677",
+   "d1a54898b9a62e85a3c1488704afe736058d5e93",
    "support"
   ],
   "interfaces/webrtc.idl": [
@@ -674994,7 +674825,7 @@
    "testharness"
   ],
   "lint.whitelist": [
-   "425730feea72429b66926298d3716b8164648211",
+   "1b102e4e03cc42f9b3d9774ed3ebbc42ede82c7f",
    "support"
   ],
   "loading/lazyload/META.yml": [
@@ -676366,7 +676197,7 @@
    "testharness"
   ],
   "mathml/relations/html5-tree/math-global-event-handlers.tentative.html": [
-   "d77aa57741c378347d08ca6cd300841bd2194c40",
+   "7bbdee261105d91f74b0880cd045a35b641745bf",
    "testharness"
   ],
   "mathml/relations/html5-tree/required-extensions-2-ref.html": [
@@ -677642,7 +677473,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.keep-scheme.https.html": [
-   "7c3ca228d795bc7cd13d637f05baea5e1c0c61a6",
+   "e6549e0043a03745999831598e7c512f43e6e5f6",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.keep-scheme.https.html.headers": [
@@ -677650,7 +677481,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.no-redirect.https.html": [
-   "fc39dbd181e28ac12c5eedc544f1291e580f6bb2",
+   "a5d9f2056765fb3abefdbc98c74f994834006d87",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.no-redirect.https.html.headers": [
@@ -677658,7 +677489,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.swap-scheme.https.html": [
-   "7e4238e5675f094aa8ab3a00daf4bbe0f27fd6f4",
+   "284fe5316dc9b2a56da434c434b772a420a00395",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.swap-scheme.https.html.headers": [
@@ -677666,7 +677497,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.keep-scheme.https.html": [
-   "64bc8adb8d6c6b92e582ec8f2014c8a27056b9c5",
+   "c95e54a13f5c0d65aed1982c7d725a068dd6d467",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.keep-scheme.https.html.headers": [
@@ -677674,7 +677505,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.no-redirect.https.html": [
-   "9c47757780e3315da78dd4b6709fc1cd5b16ac65",
+   "12e964d5243fbf7e122cd858d4238ffd10449a3b",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.no-redirect.https.html.headers": [
@@ -677682,7 +677513,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.swap-scheme.https.html": [
-   "a298e3f347fa3ab1e1a3c7c6f6c960bb7a8482f5",
+   "8d2b49a4823895fb0a3602dfc160b2bd34ef86a7",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.swap-scheme.https.html.headers": [
@@ -677690,7 +677521,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/audio-tag/same-https.keep-scheme.https.html": [
-   "7da3e5a2ddeb567e2cf27ee871985999fa0833f7",
+   "c82f589246ff8f79b165cf74f38066d819fcb605",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/audio-tag/same-https.keep-scheme.https.html.headers": [
@@ -677698,7 +677529,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/audio-tag/same-https.no-redirect.https.html": [
-   "b193871764070557b40a560de3911917de30261e",
+   "d475bbe0cf5daf22ba350215810226ff4c80bd2c",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/audio-tag/same-https.no-redirect.https.html.headers": [
@@ -677706,7 +677537,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.keep-scheme.https.html": [
-   "2604c38b67f2144ac221b5a24f1d980c83780508",
+   "0f4d641ff8fbd6ee5968dc0a4a002c441e229c21",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.keep-scheme.https.html.headers": [
@@ -677714,7 +677545,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.no-redirect.https.html": [
-   "8a297d62c48a33e251f60ac21889d8026258841d",
+   "5be5db155489b42ba2d26c25ff86204e99ba9640",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.no-redirect.https.html.headers": [
@@ -677722,7 +677553,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.swap-scheme.https.html": [
-   "a9bb4fe2853f5389accdf669065ce63038104731",
+   "3eefb62b4d1a90b4711c7f1861225d1eb49b0810",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.swap-scheme.https.html.headers": [
@@ -677730,7 +677561,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/beacon/same-http.keep-scheme.https.html": [
-   "75d150dba77f2a495f0e8561353f128b8a6b6fe6",
+   "984b353c92a0b0e202cca5343a71616065df1e2b",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/beacon/same-http.keep-scheme.https.html.headers": [
@@ -677738,7 +677569,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/beacon/same-http.no-redirect.https.html": [
-   "8203cb7e1dff8c95023d9ee0bb8071e5ee4f9777",
+   "46234a7168379884f162f6ed5842440f05ce6e7c",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/beacon/same-http.no-redirect.https.html.headers": [
@@ -677746,7 +677577,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/beacon/same-http.swap-scheme.https.html": [
-   "54114ff754bed04baa91e40420e5261f6393c2a4",
+   "27b956ee0b211fe04701cfd2688d8e8e9e5655c1",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/beacon/same-http.swap-scheme.https.html.headers": [
@@ -677754,7 +677585,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/beacon/same-https.keep-scheme.https.html": [
-   "9a7cc113b335836f2b0cfd1c9536a18dfae49c68",
+   "52f3cb99ada0cc777fb80f0ec6195144c92b584d",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/beacon/same-https.keep-scheme.https.html.headers": [
@@ -677762,7 +677593,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/beacon/same-https.no-redirect.https.html": [
-   "86c56bdfef5fd6ac2e58955b0cd6ea635df165d1",
+   "303e047ba53c9e6e8ab60a757a8b02bbbb8750c2",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/beacon/same-https.no-redirect.https.html.headers": [
@@ -677770,7 +677601,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html": [
-   "d98fee3b05f6bd04084047543bbe6dc1d13bb9df",
+   "ea9697785b3390ad80c90d0f9a431aae5aecf213",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html.headers": [
@@ -677778,7 +677609,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.no-redirect.https.html": [
-   "6f111d1262329a6a76f7fc28d8d226d38e3e2e50",
+   "8a29645586171e39db511bd04cbc3d2f58ca0134",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.no-redirect.https.html.headers": [
@@ -677786,7 +677617,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html": [
-   "0b35f8b6d90a5751f3c42233c454b5bdcd9fc71b",
+   "c080c346ccba1d790f4928fedcfdea1c6358eda1",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html.headers": [
@@ -677794,7 +677625,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/fetch/same-http.keep-scheme.https.html": [
-   "b96a2125eb64062371982798c9d0b5e01dc1aeab",
+   "ea9c18d6a81b4e9c355286d9f0f19e416665d511",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/fetch/same-http.keep-scheme.https.html.headers": [
@@ -677802,7 +677633,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/fetch/same-http.no-redirect.https.html": [
-   "280a9cdc6b80113986a34d1ad4822f8965f8df93",
+   "dfbd794400c75b35558114d94c83d9a9a47d61d5",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/fetch/same-http.no-redirect.https.html.headers": [
@@ -677810,7 +677641,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/fetch/same-http.swap-scheme.https.html": [
-   "a9063e42946cd3f8026cc7b1e361fa2375c44dc9",
+   "2e6296c483cec27a18c742a5126ab2a81fd797ae",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/fetch/same-http.swap-scheme.https.html.headers": [
@@ -677818,7 +677649,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/fetch/same-https.keep-scheme.https.html": [
-   "4e2f750fd1daab399b4c2217ffa3f03fefb3c651",
+   "34f1b72647cf216b7208f6ea3b9c31ef30361f4f",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/fetch/same-https.keep-scheme.https.html.headers": [
@@ -677826,7 +677657,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/fetch/same-https.no-redirect.https.html": [
-   "74817ec7dae18b74dedf21421437a028a9b28785",
+   "71a29f3f2d4b26b5b189352453e84ed8eca1782d",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/fetch/same-https.no-redirect.https.html.headers": [
@@ -677834,7 +677665,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.keep-scheme.https.html": [
-   "4418c78d3364ecce568fde057d02c609248faeb4",
+   "58b9064284f30d068ad77303d051cde923ba2157",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.keep-scheme.https.html.headers": [
@@ -677842,7 +677673,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.no-redirect.https.html": [
-   "d2c26b92dcccac32146b5ae73beac9b38ff822d5",
+   "45b824720b550d783b0e7a5a4f9e7a40022689c3",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.no-redirect.https.html.headers": [
@@ -677850,7 +677681,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.swap-scheme.https.html": [
-   "30ab7af050c5c4560b51a607d2524b84ba5d38a7",
+   "1a9e874ba75fc0802dc4b0ef7cca2448e469a3ca",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.swap-scheme.https.html.headers": [
@@ -677858,7 +677689,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.keep-scheme.https.html": [
-   "36191f7290bccb9cb856f259a836ce2727c89b66",
+   "459eb2c5eb88e115e3e9bd42f73c2a2362513e63",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.keep-scheme.https.html.headers": [
@@ -677866,7 +677697,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.no-redirect.https.html": [
-   "8cdd95bf999c565af4d98a7674178cbe66e3b5ab",
+   "e49927264fd2ce3b7d7dddd379c5dd6f5abbe56e",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.no-redirect.https.html.headers": [
@@ -677874,7 +677705,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.swap-scheme.https.html": [
-   "62a3562af1d6f0addadb724a7fd0058171c68f71",
+   "388e5312823cacc64f45ac3b880bdd2ac1a4158c",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.swap-scheme.https.html.headers": [
@@ -677882,7 +677713,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/img-tag/same-https.keep-scheme.https.html": [
-   "d8687bd8b6e2260c57f48f8d20e150773c327487",
+   "83297b91af32c31a15132e9cfab61457f0ddc818",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/img-tag/same-https.keep-scheme.https.html.headers": [
@@ -677890,7 +677721,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/img-tag/same-https.no-redirect.https.html": [
-   "ffa2e47c8a158cb17c30c8e95b67dcc277deb210",
+   "951b0aa295ec5846cbc86cf3ef8634fc05c507d9",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/img-tag/same-https.no-redirect.https.html.headers": [
@@ -677898,7 +677729,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.keep-scheme.https.html": [
-   "7ee418573447506286e5148c38dc42a12bb39869",
+   "4ca29b6c059db7f2998901bd5e245be8e4608a96",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.keep-scheme.https.html.headers": [
@@ -677906,7 +677737,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.no-redirect.https.html": [
-   "be00ef5d27de4ba371ffbf13de572ad6027ab5fa",
+   "edcf944a7489fa1b33b0743838918e116d1849c9",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.no-redirect.https.html.headers": [
@@ -677914,7 +677745,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.swap-scheme.https.html": [
-   "9bed22b198fec904c3ebfca6687b504b9fb10944",
+   "c408c72d125c499b9f440ab122d50d4c1dd0e393",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.swap-scheme.https.html.headers": [
@@ -677922,7 +677753,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.keep-scheme.https.html": [
-   "3849927c9b388ae822d9b9bb4765cf9278f2112c",
+   "6eabfab8234e9d33a4149d2a22413fa750cfccbc",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.keep-scheme.https.html.headers": [
@@ -677930,7 +677761,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.no-redirect.https.html": [
-   "cdde11b1449e35b83879a88eefbe660cf4f2f50b",
+   "4f823de23e66c202d2cd93de879536f7409b3cc0",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.no-redirect.https.html.headers": [
@@ -677938,7 +677769,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.swap-scheme.https.html": [
-   "e9bcc9e6bf7b9f66557c81269cc3801b4dcefd8a",
+   "96a08a133b3a998154b87c08af7afc28d92f164d",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.swap-scheme.https.html.headers": [
@@ -677946,7 +677777,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-https.keep-scheme.https.html": [
-   "493d92e34f9dcb570443e0466f2da990c0dbc58f",
+   "8f3414e493fc658865d2121c2b47c7aeeea3619c",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-https.keep-scheme.https.html.headers": [
@@ -677954,7 +677785,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-https.no-redirect.https.html": [
-   "69ab08e8f306604a464d529d8f559746d78360fc",
+   "b9b3a61d3cda8852ba6c1545f5bdc7e3b2793abd",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-https.no-redirect.https.html.headers": [
@@ -677962,7 +677793,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.keep-scheme.https.html": [
-   "30594cc754716722bb9d6c31693a8e7dca087f4b",
+   "cd95c8c3aef41ed8a24e7a5e56285001f4b8583d",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.keep-scheme.https.html.headers": [
@@ -677970,7 +677801,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.no-redirect.https.html": [
-   "533309e93b363f28fcdf576ca660b27941be4c9a",
+   "a21b718800e6f18c5ec96fcab3a1a25947497b26",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.no-redirect.https.html.headers": [
@@ -677978,7 +677809,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.swap-scheme.https.html": [
-   "5f8ce108fc61010716025b797c056e3abff7b1e2",
+   "99483c30b02541ee6067f67895b4d4675e984955",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.swap-scheme.https.html.headers": [
@@ -677986,7 +677817,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.keep-scheme.https.html": [
-   "076ecb8328dedccd92e9f743451ec829cd542bb6",
+   "6020508010cd804b201fe2dad01a0ec6dfd8fe2c",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.keep-scheme.https.html.headers": [
@@ -677994,7 +677825,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.no-redirect.https.html": [
-   "534d3a134288ffa469d38370593534c792257e39",
+   "8b6714264730f29dee3168cda404bceb40fa8e1f",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.no-redirect.https.html.headers": [
@@ -678002,7 +677833,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.swap-scheme.https.html": [
-   "cd87071760b6235b8382a0519b430b31c33353dd",
+   "29a0d46a8a51b66615a3584c6301f0fd42f43f5a",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.swap-scheme.https.html.headers": [
@@ -678010,7 +677841,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-https.keep-scheme.https.html": [
-   "1f1b6d12361497b2bd48aa7359783f3d2f38f478",
+   "0ba438eee6ea620df44100cc2a938fcdf5931490",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-https.keep-scheme.https.html.headers": [
@@ -678018,7 +677849,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-https.no-redirect.https.html": [
-   "f8cf49fd07eaaa34aadef4ed5f47ce135dea0e9b",
+   "555c53485eca88bf4674c4cd6198b41db1cdfb1f",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-https.no-redirect.https.html.headers": [
@@ -678026,7 +677857,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.keep-scheme.https.html": [
-   "de3c2cafe69ddfd53c3af562df08261153d4eb86",
+   "828db98e0dba2751e6d20e435228c2c9ae9801b2",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.keep-scheme.https.html.headers": [
@@ -678034,7 +677865,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.no-redirect.https.html": [
-   "ee9625d31ebf9f00acd07a7d6ad7a3a91d762d6b",
+   "1dace197dd27051a27e4e22186ac6cb41e6fbd3a",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.no-redirect.https.html.headers": [
@@ -678042,7 +677873,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.swap-scheme.https.html": [
-   "ab0a387f7c5ab942025eaaaf46073a2ac47d7d32",
+   "30b3c5bb3cf1da35d25b2c3fb10fbcbac4f79cbf",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.swap-scheme.https.html.headers": [
@@ -678050,7 +677881,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.keep-scheme.https.html": [
-   "edbb3f9f2db3c06c9bdef86de1fd2e940ded8cdb",
+   "ec9eb5b8f2c7bb853bd121649bf7f316f36165f5",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.keep-scheme.https.html.headers": [
@@ -678058,7 +677889,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.no-redirect.https.html": [
-   "72ae7e512a62f12b84f2a3b7fbd2afb5add7baea",
+   "4fb39defdf916bbb32ca5f7e9cab1873d557ee2b",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.no-redirect.https.html.headers": [
@@ -678066,7 +677897,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.swap-scheme.https.html": [
-   "fb969da6369155f1047a398479b91b80b902ac4e",
+   "01676bab33803db2d33224de4221284becdf6e25",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.swap-scheme.https.html.headers": [
@@ -678074,7 +677905,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/object-tag/same-https.keep-scheme.https.html": [
-   "c537a645e006a6f8caf8960643ce3a24b6969490",
+   "ac1e85311546285d7e40eb1ea3cbe67c10b50bea",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/object-tag/same-https.keep-scheme.https.html.headers": [
@@ -678082,7 +677913,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/object-tag/same-https.no-redirect.https.html": [
-   "ea3e82ac9f4ea031b550237fab47942954215a93",
+   "e248122edeb61ef753dd8f70d4dd92e956e70e88",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/object-tag/same-https.no-redirect.https.html.headers": [
@@ -678090,7 +677921,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.keep-scheme.https.html": [
-   "6ad20e5a28bb603f278046f9f22d160e47fed739",
+   "6417081f9fe189dd6a7ae84e754a88b8203e9a44",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.keep-scheme.https.html.headers": [
@@ -678098,7 +677929,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.no-redirect.https.html": [
-   "533eb0ba8fb65fa701bd086ce97dacc716f76624",
+   "2c3f9e1cbfacab2594f94cc350c4f939c1dc1f63",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.no-redirect.https.html.headers": [
@@ -678106,7 +677937,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.swap-scheme.https.html": [
-   "6c531f3cbcfd698bb81fddc2975662ed0d056a4b",
+   "886e6ef82fd8187eb7bd327e7c6ee934b36bb430",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.swap-scheme.https.html.headers": [
@@ -678114,7 +677945,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.keep-scheme.https.html": [
-   "d46d6f40430aaf23e7e6daefa7ad3e24cbdb042d",
+   "75289034c921de435915c60f30c8d2bfc7290ce4",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.keep-scheme.https.html.headers": [
@@ -678122,7 +677953,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.no-redirect.https.html": [
-   "981d6c5a2ad536bbd6337fbbdbb41c5a6e30b41e",
+   "52a421f7428cd1dca2879505ab1c8c06c26611a7",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.no-redirect.https.html.headers": [
@@ -678130,7 +677961,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.swap-scheme.https.html": [
-   "68233cd9b21eeb8cee00e1c38074694f370deff4",
+   "26ed43eca371636bc974caa31f9fd811641db4f4",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.swap-scheme.https.html.headers": [
@@ -678138,7 +677969,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/picture-tag/same-https.keep-scheme.https.html": [
-   "e702aef5b02d5260107286f07dad8b7ad765dcfe",
+   "6d10711d638f4748a864c28ca680566d3e477d3d",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/picture-tag/same-https.keep-scheme.https.html.headers": [
@@ -678146,7 +677977,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/picture-tag/same-https.no-redirect.https.html": [
-   "b26d44db206e9780a46d216f713165ae270eaeb2",
+   "fe4da56e32a76755c5448b710c006f88b6597020",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/picture-tag/same-https.no-redirect.https.html.headers": [
@@ -678154,7 +677985,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.keep-scheme.https.html": [
-   "727fc11dc385f59e8df94fe8901007a9572a6d07",
+   "a5f903c2fd262253b8876177a0416195fd52a6bd",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.keep-scheme.https.html.headers": [
@@ -678162,7 +677993,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.no-redirect.https.html": [
-   "9b416e87fb1434b37048d00afb0e9916a45abbbc",
+   "f3594a9c55c1dd90503a0b0567b462fabca3407b",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.no-redirect.https.html.headers": [
@@ -678170,7 +678001,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.swap-scheme.https.html": [
-   "fd6c3be8ae39572851ff5b3d0d12fe76d74d2192",
+   "1933b3753a23bb5a5b657c9888dba0f1697658c8",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.swap-scheme.https.html.headers": [
@@ -678178,7 +678009,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.keep-scheme.https.html": [
-   "479be7863485bd49ff87e1ca0b5d724172ae134f",
+   "bfc3391e7d4ad99ad2d1f9d3feec688848c8deee",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.keep-scheme.https.html.headers": [
@@ -678186,7 +678017,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.no-redirect.https.html": [
-   "c32977196a997ddff7a8272723ba8bf726927941",
+   "712f802dc160d1ee8314b1b408b30ce31458eca5",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.no-redirect.https.html.headers": [
@@ -678194,7 +678025,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.swap-scheme.https.html": [
-   "ba13e682fdb2b710e7f930cf2d7f578681cfc09c",
+   "c70728730d811944707bfdef009ed248cb5b999b",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.swap-scheme.https.html.headers": [
@@ -678202,7 +678033,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/script-tag/same-https.keep-scheme.https.html": [
-   "01b37600deeed9610f5f8fff92b2debbf2fb90fd",
+   "d58c20a049b88b5af4a233194c217cbd53468112",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/script-tag/same-https.keep-scheme.https.html.headers": [
@@ -678210,7 +678041,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/script-tag/same-https.no-redirect.https.html": [
-   "7d240ececc162eb02c01250efe2fd26de7b73980",
+   "3d29665067f481ae779acf4d8dfd21330fec92e4",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/script-tag/same-https.no-redirect.https.html.headers": [
@@ -678218,7 +678049,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.keep-scheme.https.html": [
-   "8eca0a7179aeddc5422fa248a7771ed6d7e843c0",
+   "8c6b5a912484bf1267a05bcf31d9d2b761ed852a",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.keep-scheme.https.html.headers": [
@@ -678226,7 +678057,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.no-redirect.https.html": [
-   "1141ccae3e465c8ee76d5f891294e7c790dc5e14",
+   "8663d092110de470f5ad9368602c326d943ab48a",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.no-redirect.https.html.headers": [
@@ -678234,7 +678065,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.swap-scheme.https.html": [
-   "d926f5ec45c244771754f47e879c4f6fea18b833",
+   "89256a2715bf2a754196f03241d93b25ecefae89",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.swap-scheme.https.html.headers": [
@@ -678242,7 +678073,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.keep-scheme.https.html": [
-   "e82185a056c9f12b127a28cc521a0f55e862ccf0",
+   "00ad7103d121af3a7e067ff02f94a227ff56e400",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.keep-scheme.https.html.headers": [
@@ -678250,7 +678081,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.no-redirect.https.html": [
-   "ed122925efedc3088b3b41e26e36e62a4ee59d44",
+   "da39ce62969111d3f6d60f4187b909c16f3dee41",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.no-redirect.https.html.headers": [
@@ -678258,7 +678089,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.swap-scheme.https.html": [
-   "5c5377d7f2fdbde6cae1b99c460070787c4dff4a",
+   "d7b69eb82e3568b44994ff2a3b2e10b7bed84d2c",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.swap-scheme.https.html.headers": [
@@ -678266,7 +678097,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/video-tag/same-https.keep-scheme.https.html": [
-   "79b3c0a284824e37bad0910c63f2743928d3edbe",
+   "89f1f67de62d68ed9ef729273fe0c5ca2b1d81ea",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/video-tag/same-https.keep-scheme.https.html.headers": [
@@ -678274,7 +678105,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/video-tag/same-https.no-redirect.https.html": [
-   "c2c7f8723c4a54c1d78e195523d2ebef8bc4a922",
+   "2860df22162786e14fa502378dfe2f88fd092c6e",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/video-tag/same-https.no-redirect.https.html.headers": [
@@ -678282,7 +678113,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.keep-scheme.https.html": [
-   "18ec117f46185af05e8cc9633f9aca1a66e9b2b0",
+   "1c5302b12c4550ed3002f7f4ea3d547518472c3c",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.keep-scheme.https.html.headers": [
@@ -678290,7 +678121,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.no-redirect.https.html": [
-   "1673464aae0ac4dd1a2277302b2127b8cf9e0722",
+   "8437326b180101b12b71536dac8f2cbd56b08c67",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.no-redirect.https.html.headers": [
@@ -678298,7 +678129,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.swap-scheme.https.html": [
-   "bd8d6fd79676c2ae39b66728fb069dc319ad665e",
+   "92fd464c93a63eed27a349700a0672c29036c7f2",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.swap-scheme.https.html.headers": [
@@ -678306,7 +678137,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.keep-scheme.https.html": [
-   "b5080134174ee64490a579e5da9844f22dc2388e",
+   "ac11208f23e95a97f6213fe63cb959301d204637",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.keep-scheme.https.html.headers": [
@@ -678314,7 +678145,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.no-redirect.https.html": [
-   "9f168b080faf350f0350bc8aad907f7f8f87f9eb",
+   "967445ee8d5dd64d2a9a71bc1b5413810519bbae",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.no-redirect.https.html.headers": [
@@ -678322,7 +678153,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.swap-scheme.https.html": [
-   "24445374ae51caf489c1ea8018a9b64d7d794c83",
+   "273712aad9bc9b07a5e0582ef934a11089900648",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.swap-scheme.https.html.headers": [
@@ -678330,7 +678161,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/websocket/same-wss.keep-scheme.https.html": [
-   "b397c4e2a61f687c9dfb248da432f32c46dbea17",
+   "47619170144977fa9bc212e7969d41136c00ff6c",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/websocket/same-wss.keep-scheme.https.html.headers": [
@@ -678338,7 +678169,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/websocket/same-wss.no-redirect.https.html": [
-   "d19674db08c4c8db3fed0d7f53353822dc034bf4",
+   "ed5c0ab8a77e14fb8b6cd7deb6ff2a3ef0b41b97",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/websocket/same-wss.no-redirect.https.html.headers": [
@@ -678346,7 +678177,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.keep-scheme.https.html": [
-   "85290c11b7165a1254ce81159be354805cafce3b",
+   "8a915c29f9f45c37c998c4caa70f819c895f4d06",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.keep-scheme.https.html.headers": [
@@ -678354,7 +678185,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.no-redirect.https.html": [
-   "0e125bcd8beca51cfccc70e511262ff21f50cc65",
+   "5aabf759341371ad8323399f83c9160407e3ddca",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.no-redirect.https.html.headers": [
@@ -678362,7 +678193,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.swap-scheme.https.html": [
-   "b92b11d0be8678052174484815d11ed9eeea260e",
+   "90c204d7a0d0dff099916a14a1eeebbb15dbc3e0",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.swap-scheme.https.html.headers": [
@@ -678370,7 +678201,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.keep-scheme.https.html": [
-   "213cf96bb28728d17dff6888b5176f9ffd66243a",
+   "93668db49e4f3d79d39ab72bc525db6353a4d74c",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.keep-scheme.https.html.headers": [
@@ -678378,7 +678209,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.no-redirect.https.html": [
-   "5ec4866157a941b1a9319af6ab60089a115b4aae",
+   "8521e37281c964ea9a226fd1bdcfc1dd33c169b6",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.no-redirect.https.html.headers": [
@@ -678386,7 +678217,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.swap-scheme.https.html": [
-   "c75044d431019681931a0031d21c5fad2871cdb9",
+   "d5f79ad60212c6ec0b48a5be3e9c6a492d4b7a69",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.swap-scheme.https.html.headers": [
@@ -678394,7 +678225,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-classic/same-https.keep-scheme.https.html": [
-   "5c5d73b35e9d76b8bb55cc56f98454bee4547151",
+   "042bd14fa8160b38c7852c168748a6c70484e4a1",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-classic/same-https.keep-scheme.https.html.headers": [
@@ -678402,7 +678233,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-classic/same-https.no-redirect.https.html": [
-   "4aa31ce50e4f91198ec3a2c13ffcaa282993cd3e",
+   "05b13b680a532429a9bc73149c5249717f8b263e",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-classic/same-https.no-redirect.https.html.headers": [
@@ -678410,7 +678241,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.keep-scheme.https.html": [
-   "adba87787174cc6734897d5211b367eeaf592581",
+   "60963f90586f89117f898378512ad682dee5e275",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.keep-scheme.https.html.headers": [
@@ -678418,7 +678249,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.no-redirect.https.html": [
-   "7b54a338fdfc9e7f8a55eb7eedb0dc3116224a3b",
+   "7ced3b86cdbc9deb1af44a99f3060df26b4caa08",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.no-redirect.https.html.headers": [
@@ -678426,7 +678257,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.swap-scheme.https.html": [
-   "57d144abd756bf9c32b15ada1f7fab60c8b861af",
+   "15711a976bf846c784391aa816312950a05c001f",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.swap-scheme.https.html.headers": [
@@ -678434,7 +678265,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.keep-scheme.https.html": [
-   "cb127cf179284c4668d296994ba2cba6bc4603ce",
+   "4a1d376683949f31b147e1b3e535e36dc0837515",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.keep-scheme.https.html.headers": [
@@ -678442,7 +678273,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.no-redirect.https.html": [
-   "768fd4cce7fd8bb9eff831556fe5c26667a3594c",
+   "b8c53bae221bdd5ced76632eff13fe0b93ea04ae",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.no-redirect.https.html.headers": [
@@ -678450,7 +678281,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.swap-scheme.https.html": [
-   "736f6bce3798287de07cb5d5928160d8db592661",
+   "be403a893c9ccef130b030c1f1857143510781e0",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.swap-scheme.https.html.headers": [
@@ -678458,7 +678289,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-https.keep-scheme.https.html": [
-   "5be23a031177ebe34b6483f5f2bcf5e496dba92b",
+   "06a8f47ae42d480c0d67bf08c9c6cef963fdc969",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-https.keep-scheme.https.html.headers": [
@@ -678466,7 +678297,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-https.no-redirect.https.html": [
-   "858a1528043a9d1a7132b37c299c5e34fa6b9bf4",
+   "211bd0d29981358e1dc754a3353f3a43219a34b9",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-https.no-redirect.https.html.headers": [
@@ -678474,7 +678305,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.keep-scheme.https.html": [
-   "a1e6f61e6b7e2db743dfb7027979cc5f0ce204aa",
+   "69dcfb7e5cb5b30f24e0b181b3b3968542673f35",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.keep-scheme.https.html.headers": [
@@ -678482,7 +678313,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.no-redirect.https.html": [
-   "a95d2061b68e1c6df2cde0b52f82692ff0dd3bfc",
+   "816e3449092a398f12a7287b4d2715764aea56ac",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.no-redirect.https.html.headers": [
@@ -678490,7 +678321,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.swap-scheme.https.html": [
-   "c396cdc20baa6bc5ac49e52abaf58705c1350488",
+   "9e167de1486d409caf0ba5ef4b41d434ad06315c",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.swap-scheme.https.html.headers": [
@@ -678498,7 +678329,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.keep-scheme.https.html": [
-   "20414a3dac3157932300b5d8e284713af3994f27",
+   "75e103e634366ff03e22e11d32b0cefed280e1ce",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.keep-scheme.https.html.headers": [
@@ -678506,7 +678337,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.no-redirect.https.html": [
-   "9397a3523e89853b6e3c2df662c37666550f32f9",
+   "f9e963d8dc778e2f59687decd714421babb676ad",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.no-redirect.https.html.headers": [
@@ -678514,7 +678345,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.swap-scheme.https.html": [
-   "0340366bdf20a1facd9f67ff46c510f77ef380c7",
+   "f0397f11b69a19ca884dfcaba8abd571d4ed1aa4",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.swap-scheme.https.html.headers": [
@@ -678522,7 +678353,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-module/same-https.keep-scheme.https.html": [
-   "da0e808f1847ef6614b3fce1f8bad0be41c114e2",
+   "b81758e5b79fa6fbf2b50c2118150087b06caef5",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-module/same-https.keep-scheme.https.html.headers": [
@@ -678530,7 +678361,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-module/same-https.no-redirect.https.html": [
-   "a009215e6013593c5ee461e35f247be61653f9d1",
+   "a7399e2dcd2647a9f440cbc77c92238758baa795",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worker-module/same-https.no-redirect.https.html.headers": [
@@ -678538,7 +678369,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.keep-scheme.https.html": [
-   "0271fd3694cb9425474f8a7ae4c09d484fced9cb",
+   "1c26e0c6e493cf60706e3dac9b527b18c12bfda7",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.keep-scheme.https.html.headers": [
@@ -678546,7 +678377,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.no-redirect.https.html": [
-   "2a1158bbb9974f900dc1583d73907143bd1d62c0",
+   "3ba399bb528163ccf6ad67fb052dc51bd75dfdfc",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.no-redirect.https.html.headers": [
@@ -678554,7 +678385,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.swap-scheme.https.html": [
-   "d9f4916bee788fae5cb5c0cd5672d92ff33f6d34",
+   "b5950d9318f4ee0ca970b39299dda05a2fb1c5d8",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.swap-scheme.https.html.headers": [
@@ -678562,7 +678393,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.keep-scheme.https.html": [
-   "5258084ec5e95ff7d100bc5c59043ceca78987ec",
+   "b9a80c07de42b59b1cc1d6ed6154113749041269",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.keep-scheme.https.html.headers": [
@@ -678570,7 +678401,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.no-redirect.https.html": [
-   "437db2c854b14007254ab39eb3849d3aa6df36c4",
+   "1b2f858a7ab7a6cb620da2e322cad277cc568877",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.no-redirect.https.html.headers": [
@@ -678578,7 +678409,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.swap-scheme.https.html": [
-   "48fb79a3021ca1f0c99c10f8533aba9f3b4c9bdd",
+   "6c8e517bf53137601c528131011d2571b80d5859",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.swap-scheme.https.html.headers": [
@@ -678586,7 +678417,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-https.keep-scheme.https.html": [
-   "49a5222cf78b89f65bdbae0222de68de3681a5a3",
+   "403fc3417d7736bcd08766fca50fe6bdc8a10b74",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-https.keep-scheme.https.html.headers": [
@@ -678594,7 +678425,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-https.no-redirect.https.html": [
-   "b111698b904c7fab5a17076fdd5ce57c27c05c10",
+   "89f4bd68af83f3ff61d48c0adee951db5453cf54",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-https.no-redirect.https.html.headers": [
@@ -678602,7 +678433,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.keep-scheme.https.html": [
-   "5973cc7ef1fe8cf481e46c2689842cda3703c997",
+   "a2eff5fdbb029111ef79b73ba5faa9abee764fda",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.keep-scheme.https.html.headers": [
@@ -678610,7 +678441,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.no-redirect.https.html": [
-   "6f8ec890f139482214c7a310c0d1a6c81412b83f",
+   "d778e5c873ce92ca21f4071f643c2af8ec8b8d2c",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.no-redirect.https.html.headers": [
@@ -678618,7 +678449,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.swap-scheme.https.html": [
-   "21e8ec651d0f349647ad38049c9911b533b6ee02",
+   "23b98c374e42dd018b0c0574cdd3fd2b2abcba24",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.swap-scheme.https.html.headers": [
@@ -678626,7 +678457,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.keep-scheme.https.html": [
-   "9f57d2e8d762400181cb5efd865e83057cae2a29",
+   "c35a70d5bd95e9f514599e2d158315ba176bb4ac",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.keep-scheme.https.html.headers": [
@@ -678634,7 +678465,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.no-redirect.https.html": [
-   "0e4e5dab66a511a902c6d4b45060534da2ae2bd3",
+   "b4623495821e4d2e66ad413030973de97d3a33bb",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.no-redirect.https.html.headers": [
@@ -678642,7 +678473,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.swap-scheme.https.html": [
-   "97a512f434d5735cdcfe0342f7c6b031a19fb6e5",
+   "fcb0b175c356ff219ba1892bbef5d38dd2f1b72c",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.swap-scheme.https.html.headers": [
@@ -678650,7 +678481,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-https.keep-scheme.https.html": [
-   "91ef446211f449504bf435983728f036a493fcf0",
+   "1afc5a269779c869aeba2abd3bd4887c2e2f648a",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-https.keep-scheme.https.html.headers": [
@@ -678658,7 +678489,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-https.no-redirect.https.html": [
-   "a5f042be15096ca0b6105a165051f369d8f5a375",
+   "ed7892242a975165bfaf66bbf3ef9ea330b1a04f",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-https.no-redirect.https.html.headers": [
@@ -678666,7 +678497,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.keep-scheme.https.html": [
-   "6e8da756204ef8c4fa3b9eec351ced53967a9b54",
+   "fedb12fcc32cbeac63f789f9411ea307c2cfe87e",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.keep-scheme.https.html.headers": [
@@ -678674,7 +678505,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.no-redirect.https.html": [
-   "32fa16408b125824f00ca18b22ed9181342c7092",
+   "657ed84d2bb6d79968f5a62081d2327c6a1cd512",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.no-redirect.https.html.headers": [
@@ -678682,7 +678513,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.swap-scheme.https.html": [
-   "9fab4e28179ee55f8a904f04d278d6d823c61403",
+   "1ccb5f30cc515fc847094aa3a0afdd2f1ebac56c",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.swap-scheme.https.html.headers": [
@@ -678690,7 +678521,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.keep-scheme.https.html": [
-   "81a971be92176761e1e710901c9a11287df382c1",
+   "caa5f4b57e4e424d6e5953400eec225a4f760f1d",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.keep-scheme.https.html.headers": [
@@ -678698,7 +678529,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.no-redirect.https.html": [
-   "5d434c0504716491b0e44d97cdad252698aed425",
+   "7bf0db17cd5a7d8302b5a8c872bdfb26f6c6ccd6",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.no-redirect.https.html.headers": [
@@ -678706,7 +678537,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.swap-scheme.https.html": [
-   "431caad8a022f1e5e255ecc4e3a3479403693083",
+   "4a91a21f0dd3b462136d0a536c417592376bd107",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.swap-scheme.https.html.headers": [
@@ -678714,7 +678545,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-https.keep-scheme.https.html": [
-   "e569aca97f8baf788a768754ed646772cf146ea5",
+   "d7d0f8c6b883b0b7b1fe73b2c30d14c030f951d5",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-https.keep-scheme.https.html.headers": [
@@ -678722,7 +678553,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-https.no-redirect.https.html": [
-   "00a1085db0321eb9f9cca4e05959ad4c269334f9",
+   "78472a912426721ba3f6cd2527c27d3196ef389e",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-https.no-redirect.https.html.headers": [
@@ -678730,7 +678561,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.keep-scheme.https.html": [
-   "1f4d8e61eeea8109f658fe9a00a9347c651e76e0",
+   "2cbded7e61461bd2127d71b90fc8712d6fb04952",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.keep-scheme.https.html.headers": [
@@ -678738,7 +678569,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.no-redirect.https.html": [
-   "4027b3ec8585f4638bdd9d7bd2b2c6362ad08cc3",
+   "4e75da94e531ff9b44f78948e4f53af04d6d807e",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.no-redirect.https.html.headers": [
@@ -678746,7 +678577,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.swap-scheme.https.html": [
-   "90d4553b6b8157c7b2fcb59a78f7b91bc59c2d0d",
+   "98faf005e955450e214f5738d9e4a9e8c8e6ee1e",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.swap-scheme.https.html.headers": [
@@ -678754,7 +678585,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.keep-scheme.https.html": [
-   "81bffa4220feb7340c3431216a4b52f876c64744",
+   "4da5197252c3b3afe8dfd230e63750a9110cf70e",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.keep-scheme.https.html.headers": [
@@ -678762,7 +678593,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.no-redirect.https.html": [
-   "31e123c95f9f8d07ef4a6e20994e0ff0d3561df5",
+   "709562268b2829d8c15ce542703a434dcd0b4c4e",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.no-redirect.https.html.headers": [
@@ -678770,7 +678601,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.swap-scheme.https.html": [
-   "ae01e10930f4c8598f0614e07ea1655cc0a16a2c",
+   "991ddf81804dd2b2ef99579f74240d0069c69d2a",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.swap-scheme.https.html.headers": [
@@ -678778,7 +678609,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-https.keep-scheme.https.html": [
-   "131bfeb17377443b06fcfd4a1aad10eb06dd6e65",
+   "f199071a9596b8038a9c527f4aa5a5c7c81f91c2",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-https.keep-scheme.https.html.headers": [
@@ -678786,7 +678617,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-https.no-redirect.https.html": [
-   "96e0e303b99129075c7c558bc20e9bb9e289b92a",
+   "76b119d51815fd92812aa7acd11a6bc3ac747035",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-https.no-redirect.https.html.headers": [
@@ -678794,7 +678625,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.keep-scheme.https.html": [
-   "d6de7f78362ee6d1e45a13beefef978106ff1ac7",
+   "4f5d2f6030a23e0280de1ff8edb1e7b6647e6243",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.keep-scheme.https.html.headers": [
@@ -678802,7 +678633,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.no-redirect.https.html": [
-   "5109c5b45f1b8f9a53e9a0aa9402665939b3745b",
+   "09aa789768874951777302daa228bece783e959c",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.no-redirect.https.html.headers": [
@@ -678810,7 +678641,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.swap-scheme.https.html": [
-   "9e0eac105f48453eca8f9fd4aebfdbb3ba7076ed",
+   "345d3d600188a29dad5a129cd046d9c0ee8a22e2",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.swap-scheme.https.html.headers": [
@@ -678818,7 +678649,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.keep-scheme.https.html": [
-   "8c1d39e2e53273491463d19e272003285ce9e3c8",
+   "529c85c68fd2eac97bde46294c619d8abd5cfde0",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.keep-scheme.https.html.headers": [
@@ -678826,7 +678657,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.no-redirect.https.html": [
-   "da24a8a50b4915c521cbbb800637dc827985fcda",
+   "ff88cbd4453945cc18a3498190b2392e5ddb2ceb",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.no-redirect.https.html.headers": [
@@ -678834,7 +678665,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.swap-scheme.https.html": [
-   "7ec5888d3cd899820e5838a074c029a338312ed0",
+   "5fd88554beea6c7cf7ce17679a35aef17544a340",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.swap-scheme.https.html.headers": [
@@ -678842,7 +678673,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-https.keep-scheme.https.html": [
-   "0609fa835c291b72ba50e374a7fb65b2e74321d4",
+   "f834427d90692cc606b817977a87caaef3d2d23a",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-https.keep-scheme.https.html.headers": [
@@ -678850,7 +678681,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-https.no-redirect.https.html": [
-   "a55cbc20b3f17030d1a04b96505641d670085270",
+   "06138a35960cdcb54ae3ec22926a256cd92b2f46",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-https.no-redirect.https.html.headers": [
@@ -678858,7 +678689,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.keep-scheme.https.html": [
-   "e96a0649bdb469a62e75bb4db06139a23c8853c8",
+   "4bec395b89bccfb3078bc626dd9750ae4cc0ba7a",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.keep-scheme.https.html.headers": [
@@ -678866,7 +678697,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.no-redirect.https.html": [
-   "9367a0e6ef6ba1a4ea4b7925d6e16d7c520aa836",
+   "5a98e96931578ebcca310c4f134ee5a2767f161a",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.no-redirect.https.html.headers": [
@@ -678874,7 +678705,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.swap-scheme.https.html": [
-   "5dc4ebcd7f8e635ad34efe46e1952769ead83b33",
+   "e4ebe6eec9eb13e494a1836b004d19a3e1e6d19f",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.swap-scheme.https.html.headers": [
@@ -678882,7 +678713,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.keep-scheme.https.html": [
-   "d2840c520801ef551795bcf055d05d73e9778f83",
+   "bee78809a5c5c266fbbb6018a46eff3cab6b54ef",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.keep-scheme.https.html.headers": [
@@ -678890,7 +678721,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.no-redirect.https.html": [
-   "b3b9c49faf3643d137cd7cad6814367b9be5eb6e",
+   "18102d6d2fa71d923f0cdcda2acdfe1c7a14b542",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.no-redirect.https.html.headers": [
@@ -678898,7 +678729,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.swap-scheme.https.html": [
-   "ef03e297e96eadaf4a8975d23519b9b149090ecf",
+   "5b9ae888b2547d9d926a385f81d8b4cea7a2e422",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.swap-scheme.https.html.headers": [
@@ -678906,7 +678737,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-https.keep-scheme.https.html": [
-   "fc92036fbaebea1967e237a256d1141b14263797",
+   "a2211cf181ff97c5911902c86d604c1744e49ed1",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-https.keep-scheme.https.html.headers": [
@@ -678914,7 +678745,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-https.no-redirect.https.html": [
-   "45dfa55e2129a68a9c250ce81574c0eb0a8fbfc7",
+   "c16b9831bcbb691ab36df73a9aa21e8a0f939920",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-https.no-redirect.https.html.headers": [
@@ -678922,7 +678753,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.keep-scheme.https.html": [
-   "e881494b92bdf7867c12ceeacfae285bc1bae4b9",
+   "a483e48787d47f703eabbbd38dfbfaa85aa826c4",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.keep-scheme.https.html.headers": [
@@ -678930,7 +678761,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.no-redirect.https.html": [
-   "afca8013aad30e6d40c47918d1a681a9ca09a5bc",
+   "de0e2d31f32951c12ad99a82ac4a285e9040cfc0",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.no-redirect.https.html.headers": [
@@ -678938,7 +678769,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.swap-scheme.https.html": [
-   "582221b6ebf1995bdb581c765456be6776e52faf",
+   "bcc80e96055540d926691869c840c153a592b8b3",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.swap-scheme.https.html.headers": [
@@ -678946,7 +678777,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.keep-scheme.https.html": [
-   "fb9a3a471be6e5113d2429ed5465aeb251b0e9e3",
+   "8767eb58485a33cfbeaf2be7960bb38d8955b34c",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.keep-scheme.https.html.headers": [
@@ -678954,7 +678785,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.no-redirect.https.html": [
-   "1c5ac976e991c73e78737371ff01509f74d0dec7",
+   "a4dffc09951ecc621436e632ab92ee16682f88c7",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.no-redirect.https.html.headers": [
@@ -678962,7 +678793,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.swap-scheme.https.html": [
-   "ff4a8e85b2b7b75ba501e914b1daf3909c04148d",
+   "5242d8ec951b1c1bf50425075441f23988f09ef4",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.swap-scheme.https.html.headers": [
@@ -678970,7 +678801,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-https.keep-scheme.https.html": [
-   "cc89ca597315ef4f7ad3ebc816f23e8c951e1442",
+   "b1814df609cc59ecf0432343ce46622281f9bcc1",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-https.keep-scheme.https.html.headers": [
@@ -678978,7 +678809,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-https.no-redirect.https.html": [
-   "f61e2d7983a011d606dd0b3772a2f587b9af68ee",
+   "14fa0ffa3ecbadca27a40e67b81d3014d93d913b",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-https.no-redirect.https.html.headers": [
@@ -678986,7 +678817,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.keep-scheme.https.html": [
-   "8ba634d1be61bce28cf4ae7a626a16c13ad24f3f",
+   "b8a19ccdb2646485c84ab4ec53c8c340594a4b6f",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.keep-scheme.https.html.headers": [
@@ -678994,7 +678825,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.no-redirect.https.html": [
-   "216be7f865046f9fc2b15db7182c002ea58c811b",
+   "01dac7c6e1dfb50e0e6c5c26fc6526925a82b0d2",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.no-redirect.https.html.headers": [
@@ -679002,7 +678833,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.swap-scheme.https.html": [
-   "1340df63bfbc16057a9ea171464ec6aa9fc2746b",
+   "92eea339a7c37bf8a6c9b3cd7febb272b961f28a",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.swap-scheme.https.html.headers": [
@@ -679010,7 +678841,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.keep-scheme.https.html": [
-   "a4ff29a8ba3ee2d3cee2539f1f6c42fe5d1b1ace",
+   "88bf23e9270120f407b0a5b073b14d4129495168",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.keep-scheme.https.html.headers": [
@@ -679018,7 +678849,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.no-redirect.https.html": [
-   "884c56348218c643122316d591242e3fd24ff99f",
+   "037008e4c66ed75581667404637f668b7d75cb49",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.no-redirect.https.html.headers": [
@@ -679026,7 +678857,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.swap-scheme.https.html": [
-   "bd6fcbbb06cde492e30227b3110a2cc5044ac632",
+   "c758770f96bc8bf4f8b6109334ef60a3d0cc061b",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.swap-scheme.https.html.headers": [
@@ -679034,7 +678865,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-https.keep-scheme.https.html": [
-   "a6b18616e2b2d05fcc0556d74f3740f846412967",
+   "337c8745aa6e7df22692fff7f033cb7ba2a0f261",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-https.keep-scheme.https.html.headers": [
@@ -679042,7 +678873,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-https.no-redirect.https.html": [
-   "6ddc092c5d644d37c76db329f52dd9caf763b272",
+   "053785eed75c8d584f7b34c273f506ed3d90d870",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-https.no-redirect.https.html.headers": [
@@ -679050,7 +678881,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.keep-scheme.https.html": [
-   "9ff477cc49d68e3f55af822c71ea759fb3c27393",
+   "6d53b02630108b44f2e2dd5c3fef9fff31039572",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.keep-scheme.https.html.headers": [
@@ -679058,7 +678889,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.no-redirect.https.html": [
-   "fbfb8fbe7f922e676254bff78e1d44977a19584f",
+   "963c4196c28dc34ce666bee3ab79f6ffe1bc70a3",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.no-redirect.https.html.headers": [
@@ -679066,7 +678897,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.swap-scheme.https.html": [
-   "fa55bdbe2ba2f6b73d565d9d7df1e63acedae3b8",
+   "17eec1450493217946163e73abcea52de23a10aa",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.swap-scheme.https.html.headers": [
@@ -679074,7 +678905,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/xhr/same-http.keep-scheme.https.html": [
-   "8522fa36fb36c9bb06b4b44139def2b2761636c2",
+   "792a2901f485569d7c10d0ae401a816987f4887b",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/xhr/same-http.keep-scheme.https.html.headers": [
@@ -679082,7 +678913,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/xhr/same-http.no-redirect.https.html": [
-   "1668b85c48be232779d448c5404035ac30816195",
+   "2feee7befe86f1ce155b2a2c18081beccc5e972f",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/xhr/same-http.no-redirect.https.html.headers": [
@@ -679090,7 +678921,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/xhr/same-http.swap-scheme.https.html": [
-   "98ed3608031bd80cecc4c824c28854c9a744ce70",
+   "a976fc107d48fea3219817a3c32168c686076545",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/xhr/same-http.swap-scheme.https.html.headers": [
@@ -679098,7 +678929,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/xhr/same-https.keep-scheme.https.html": [
-   "e05e09b077fdb2293e7322f81cc561cb677ee1a0",
+   "cab77fe02d1601b852e5946535686f7424fed529",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/xhr/same-https.keep-scheme.https.html.headers": [
@@ -679106,7 +678937,7 @@
    "support"
   ],
   "mixed-content/gen/top.http-rp/opt-in/xhr/same-https.no-redirect.https.html": [
-   "0c58b6aadec567aa382189b85ae96e2fd8db4761",
+   "b9bc0f4f535c530672bef274a80a7ab3811074b3",
    "testharness"
   ],
   "mixed-content/gen/top.http-rp/opt-in/xhr/same-https.no-redirect.https.html.headers": [
@@ -679114,1019 +678945,1019 @@
    "support"
   ],
   "mixed-content/gen/top.meta/opt-in/audio-tag/cross-http.no-redirect.https.html": [
-   "41a6ca4fa89845279078546c22d5069583cc7101",
+   "d0c3456fefcb69e043da4854ec1e6c48a13a8084",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/audio-tag/same-http.no-redirect.https.html": [
-   "d1c7fe9a48fc6d49b32a7a67bb1163c620c9c7b0",
+   "eea7de15bd7aed658864902dcb7499ba78447766",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/audio-tag/same-https.no-redirect.https.html": [
-   "0e29720d16ead0ce944839faff7d2a19211571a2",
+   "76a30178db44a661193613bb4a69f581e4f59008",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/beacon/cross-http.no-redirect.https.html": [
-   "75f0e66ed2456c24d91f668a8fe94768a9377cfa",
+   "a9fe9a58558a7a7d6993cc7d119d6efac9826c7a",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/beacon/same-http.no-redirect.https.html": [
-   "c0a950443f58a0e3e85f7607d1dedcb4614015c0",
+   "2ab2f874e0dfac081c13a2b73f30b7a645aa59f5",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/beacon/same-https.no-redirect.https.html": [
-   "4443ddbf63a9772e048b0beefd608890ec839af5",
+   "7596600ff1b670c6a73401bf0ef91d6994050656",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/fetch/cross-http.no-redirect.https.html": [
-   "7d903934db4c7550031649a51b37e8f7fbc5950c",
+   "4d3494449c459467e0a1da2d8e9c325c489a5d0b",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/fetch/same-http.no-redirect.https.html": [
-   "2842dc4a5da8b07fad5a4bfc7a7337c7df88852f",
+   "def5709f833bd2988dcdb24433986a9c68f0dbef",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/fetch/same-https.no-redirect.https.html": [
-   "7c9a29f34c149a334f5afef668444889bb18403c",
+   "154c05f61161a9a2a6d7763022740a2bcb4908bc",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/img-tag/cross-http.no-redirect.https.html": [
-   "646f07032ef1cc9a9e5a1e5f4f9d223c51ac43e3",
+   "942a32b96b053fd826b519ba4e6a8eb6664780fe",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/img-tag/same-http.no-redirect.https.html": [
-   "1d3ad732ca8bda4245e8a0e9cec57b8bfcb30f29",
+   "eaadb43e212b5b24cb630055c0469ffaf4a6d286",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/img-tag/same-https.no-redirect.https.html": [
-   "33f3c0ce6c98db0af2d56c04650a8bd5a343306e",
+   "8db9f5ffdbbd4656b55e60249cf37f8b6741838e",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/link-css-tag/cross-http.no-redirect.https.html": [
-   "fd88ca31c2b01494c345f92b84c48837b1882c35",
+   "f687166671afabb777f513caa363ade619579719",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/link-css-tag/same-http.no-redirect.https.html": [
-   "26cd1cd8599b37c2ca9105b3b04be3ee97b78667",
+   "6dada36eac4093f0e1b20006632c532cb0691107",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/link-css-tag/same-https.no-redirect.https.html": [
-   "ac7d84ce57a156e3238ef5697d8ef64e790a1332",
+   "ca9e6bd98be4fe360bf8492f3871bb72464332b7",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/link-prefetch-tag/cross-http.no-redirect.https.html": [
-   "9b666e04466b2c108ae47b67263bc2111d65a8f6",
+   "a613a1cc917dbb161ac85f98e39403b19b38ad63",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/link-prefetch-tag/same-http.no-redirect.https.html": [
-   "8b091cf805de0e37d5cadb3e6f6536fa218b9ea8",
+   "8af35047e08a58ee65680d88a4b206a4cfd4c8cb",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/link-prefetch-tag/same-https.no-redirect.https.html": [
-   "0ab72967f38f0e38005fe235ccc4fcfa5a7323b9",
+   "c832f319813240459a5c5302055c1b55fdb8e741",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/object-tag/cross-http.no-redirect.https.html": [
-   "911a6c14b85992e20b2cb08bfcbabf3a8960be72",
+   "1026da6765f418fcea8efdbaf860515cd50fc1e5",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/object-tag/same-http.no-redirect.https.html": [
-   "2d98598312be9705dc1f9180e5edb2506489ab20",
+   "881141b03574bad422155f7b7b13f118d43135f1",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/object-tag/same-https.no-redirect.https.html": [
-   "1981266f34c6bb8e2a1f305b302f81264dc58280",
+   "b593447c70f3092cc236b1a960c90343a836b635",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/picture-tag/cross-http.no-redirect.https.html": [
-   "e5d5382d61018d07cd31c1cb04b842cc2d5cd4f2",
+   "4bcc50cf6231260c7cb97311a23c538e4160e653",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/picture-tag/same-http.no-redirect.https.html": [
-   "8da3f84ab7da584b331fe82c36f68d0ca6a16852",
+   "31bc96e147f8495cd1840b11ba34ca8560a5146c",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/picture-tag/same-https.no-redirect.https.html": [
-   "a8934783f5ee1eaf922bb1ca13d1acb851132057",
+   "3dbc401b72045bb42daa464676b61bd8a1f17460",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/script-tag/cross-http.no-redirect.https.html": [
-   "7c77c277c11b4a0b1c74e04802559e6481e9e3f4",
+   "9324c61295b6a6bad3940150572e48c98a7603aa",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/script-tag/same-http.no-redirect.https.html": [
-   "57ff57251ea93aff60c099605d2af21bf57158d0",
+   "51834ee80f7f436312eab7014c641bcbcb4c5f08",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/script-tag/same-https.no-redirect.https.html": [
-   "143831d1ab6d2272457c2ea109fe80a99164ad71",
+   "c96bec02a15bd90c3c5562100d2d6260ce77f8c6",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/video-tag/cross-http.no-redirect.https.html": [
-   "356a34843f4db522dc2040ab83a4010c779468d2",
+   "12e43d3e7e3d36fb3aeda8037cabe285e433b806",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/video-tag/same-http.no-redirect.https.html": [
-   "6bc12d11978f56dedc7c551ecde3d991aee8bacb",
+   "1d525b429664022fccc9430fce48550039b44720",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/video-tag/same-https.no-redirect.https.html": [
-   "5e3bb47e4d5089c91bbbfcd2cff0bdade60f20a5",
+   "60219c64304e042a8e8048fb21795de6ead72d94",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/websocket/cross-ws.no-redirect.https.html": [
-   "afabb884f87d3220bfba546d5edc10270af6f217",
+   "4e192afe824c38c4dee8375504284b1178231956",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/websocket/same-ws.no-redirect.https.html": [
-   "b069f26285c3e18e1164274aa159151d4238e5cf",
+   "5a3ae54730595b0b6f664f83ae84445504e91425",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/websocket/same-wss.no-redirect.https.html": [
-   "0eb3615fadb36502ecb07480bc8d8af970e1df52",
+   "4764cab154b0486963d1ca21134eac8d7e3267aa",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/worker-classic/cross-http.no-redirect.https.html": [
-   "aec04843dc36dcda484d9395b20161a1256cd14d",
+   "36ee4ed56d04f5f7b240a1760e17180c58ec8ed4",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/worker-classic/same-http.no-redirect.https.html": [
-   "8f225224e1e2bf7188deb7d6369dac55e649105a",
+   "bdc906277b1d3fde69f8cfe558f77beed9c436ca",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/worker-classic/same-https.no-redirect.https.html": [
-   "6312ec33cd878babcb6984831baad13310074004",
+   "d29ea4ddf0fcb5f28069370c76b11c3a01fd2386",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/worker-import-data/cross-http.no-redirect.https.html": [
-   "4691301d41d555706de73ab26d3c84d618438157",
+   "a6a754731322c5c82b5608a97e2bfc20f2adceaa",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/worker-import-data/same-http.no-redirect.https.html": [
-   "1df8ad9efb03b17d2722fd028683c488b6d03e1b",
+   "e5662eca7828b419fdbb8a15ea17211b523545a3",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/worker-import-data/same-https.no-redirect.https.html": [
-   "670ffdd28e91dff64a24ab67f72de14b43118719",
+   "ce40498e7af0abd9e0b1428dd1d97447caee91e0",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/worker-module/cross-http.no-redirect.https.html": [
-   "95690945ebde5fffdfd14dab95bb83921c080ef3",
+   "87dd4d87ee0cea8d73f35e95a1f31eafa85669a9",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/worker-module/same-http.no-redirect.https.html": [
-   "66fb5c30326259bbad4d7d330991f23a0f463d5e",
+   "e837b2cbbd2299165bade9dfaeffd0297289feab",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/worker-module/same-https.no-redirect.https.html": [
-   "aa75c6e95af2a345e2c34b924db23bbe1f4a26e5",
+   "ed25f086f569e23a77ff396e487ba1060a987b6b",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/worklet-animation-import-data/cross-http.no-redirect.https.html": [
-   "d114a5744b6bbd55aca8bb60c05bfa382272784f",
+   "e3c25daa7cd77eb667f6ca2a4e6cbeb20669d82d",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/worklet-animation-import-data/same-http.no-redirect.https.html": [
-   "74fd65195cbfbdcdab76b72ba788b56d687ea39b",
+   "6059273d49ce81c7bdb7d82ee04761b2aa549ce5",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/worklet-animation-import-data/same-https.no-redirect.https.html": [
-   "d7b407df50827f4e42172ad41243d8b9bcee6794",
+   "d5e1333f680b6b8dc9d28dcda016a54782c91c7e",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/worklet-animation/cross-http.no-redirect.https.html": [
-   "491e1178c2b5fdab0b235137860e1b5e34792e85",
+   "b470340f8712bcb5782a168a52250111a8b6c968",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/worklet-animation/same-http.no-redirect.https.html": [
-   "80eb66fa2525006b6f03b45915a474b6d26cfb36",
+   "be79725a1d7aff2118a14d397564f5e910529009",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/worklet-animation/same-https.no-redirect.https.html": [
-   "b6e56d9c0f5bbbb236ec329e3f91bc0622b522a0",
+   "a70282ab4323219c03004156eb9c909169b17ed0",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/worklet-audio-import-data/cross-http.no-redirect.https.html": [
-   "d0d6d48098e587890a66aa06385b483d1b5dc7ca",
+   "a50ed273c5438b40af838cd6fb106890dc5935ab",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/worklet-audio-import-data/same-http.no-redirect.https.html": [
-   "45788a9ef5f6e72200224894fbee191f1215299c",
+   "f284152c72e85983f7f1fe4305247f26ed60fba6",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/worklet-audio-import-data/same-https.no-redirect.https.html": [
-   "2e1866acc7a7ec30e4836a68d0560fb1e765c130",
+   "517c97f1b0bbff00e15d412a8172604dc0efd26b",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/worklet-audio/cross-http.no-redirect.https.html": [
-   "bd0f0e6c126cb222afc74958f4fad9e83ce2d9e1",
+   "866046e59efeb999a4141705b8d3567bee2737d3",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/worklet-audio/same-http.no-redirect.https.html": [
-   "61904821c9a809bf43707c0551c022b5e5ad2624",
+   "7eeddcfdb0990b9a833d50fc9ee11ee1ef03c5d4",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/worklet-audio/same-https.no-redirect.https.html": [
-   "343df639234294477a7e7c4d6dc8e6949807fcbd",
+   "a3804ee8f9e97bfcd80e46f7fea15e3d61942d19",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/worklet-layout-import-data/cross-http.no-redirect.https.html": [
-   "76cac0228daacddbda3c3010ba5c49c50bce33c1",
+   "284fd13f0e8f94783644619aa4bcc6afe412f753",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/worklet-layout-import-data/same-http.no-redirect.https.html": [
-   "880fb302332e9768b8519e8c6e030d331ace7583",
+   "d478c13176487c84794649eb825a2f5e8ce54b80",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/worklet-layout-import-data/same-https.no-redirect.https.html": [
-   "a833d44f73191c27e71daced344fb0254e006353",
+   "dbba6efaa218dd92364fd194bde75474e3df9933",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/worklet-layout/cross-http.no-redirect.https.html": [
-   "e12e978f198e1c6215ff43f9dd96467f48221a33",
+   "f0f027571bc5deda52a48fc73e3da7e1d779fe51",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/worklet-layout/same-http.no-redirect.https.html": [
-   "448583db71ed95ea422e2f38f31cb2e33db50f88",
+   "fdf08bb84067029d78c902378f134c98bdfbba59",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/worklet-layout/same-https.no-redirect.https.html": [
-   "e395b04a8d7fc82cd42e9c1e93c2d557fb104bf5",
+   "fd1cfc09ae39d5818f62ba91090db83f46f84a41",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/worklet-paint-import-data/cross-http.no-redirect.https.html": [
-   "bd6943b0962df424a4a6071644dbf9bd7435cafd",
+   "17ae0d1bfbdec7ace499d54bd885996bea5ecc71",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/worklet-paint-import-data/same-http.no-redirect.https.html": [
-   "f0bafddb4af2fe22ed15bbd15f012debe8e9147f",
+   "b5ec91933ef5c2f3ffa6e734d39b4c5113d6b4a2",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/worklet-paint-import-data/same-https.no-redirect.https.html": [
-   "16a6b331df2bbd464159379b6bcf6a673d6c0573",
+   "5ba63761c67ba7d26b7bcc8cf0beeb4bbe1b2470",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/worklet-paint/cross-http.no-redirect.https.html": [
-   "23dbcd9eb6842fb48d80e9532e83439d86fd8038",
+   "6bcffc7ead6a65595f2100ac7f68203c50a14114",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/worklet-paint/same-http.no-redirect.https.html": [
-   "6d5642fa6526ad4564fd8d09998e8545531ff8b1",
+   "2116616b1559cf35eeb139bf9ca90fa419326123",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/worklet-paint/same-https.no-redirect.https.html": [
-   "2a67ca33750a2d70b6d7eca440b789d0392d3c9a",
+   "d07de21b79de4b776666f7ad55a6ffb7fe8cebe5",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/xhr/cross-http.no-redirect.https.html": [
-   "bbf7fc8b79ea8dc87011d04279340421e81bd961",
+   "4d8bfc526338aeca8dae30574c0ff593c79ea399",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/xhr/same-http.no-redirect.https.html": [
-   "2e2ecab17b27bd506bb6057a62f157a3d49d9a4f",
+   "0224948fad4a3831e80b6020d6fa3bfe67058195",
    "testharness"
   ],
   "mixed-content/gen/top.meta/opt-in/xhr/same-https.no-redirect.https.html": [
-   "9d700e35260730a4b4bcbd5c3d57f1bbb30ffdbe",
+   "b0b4c3a5bc68f918a1a5716b7555785230a177a1",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/audio-tag/cross-http.keep-scheme.https.html": [
-   "876211d9255f923586b9aac4659faf41db1b4f67",
+   "f955c31235f659594289d5d87c0724a69bc97d57",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/audio-tag/cross-http.no-redirect.https.html": [
-   "b999bfffa34be79f16bcc2f77ccd6672e5d60ff0",
+   "d06517a0b7a685f0457682cb0a74bb82fdb7e8e9",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/audio-tag/cross-http.swap-scheme.https.html": [
-   "bcb03d808ed60599cf37d07da2ec38d7b467e1de",
+   "56f69bf16e27bb38af23121e0f842b8f5d72a93d",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/audio-tag/same-http.keep-scheme.https.html": [
-   "42fdd2b3ebac65a00881dd6fbc80520cd054d7cc",
+   "128a457d134b821e1235d04214ff91fed251599c",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/audio-tag/same-http.no-redirect.https.html": [
-   "47a718305557f050cd4e75f8d61299b1c8c73a4b",
+   "0d7bbbd3899ed64a794987a2651bfcc0b141277b",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/audio-tag/same-http.swap-scheme.https.html": [
-   "ac2a203253003784a9e1c24c8d7162f406fcc8a2",
+   "11c60ffbb56db9a49ea15f172457e4c75e7fc367",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/audio-tag/same-https.keep-scheme.https.html": [
-   "7da3e5a2ddeb567e2cf27ee871985999fa0833f7",
+   "c82f589246ff8f79b165cf74f38066d819fcb605",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/audio-tag/same-https.no-redirect.https.html": [
-   "b193871764070557b40a560de3911917de30261e",
+   "d475bbe0cf5daf22ba350215810226ff4c80bd2c",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/beacon/cross-http.keep-scheme.https.html": [
-   "2604c38b67f2144ac221b5a24f1d980c83780508",
+   "0f4d641ff8fbd6ee5968dc0a4a002c441e229c21",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/beacon/cross-http.no-redirect.https.html": [
-   "8a297d62c48a33e251f60ac21889d8026258841d",
+   "5be5db155489b42ba2d26c25ff86204e99ba9640",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/beacon/cross-http.swap-scheme.https.html": [
-   "a9bb4fe2853f5389accdf669065ce63038104731",
+   "3eefb62b4d1a90b4711c7f1861225d1eb49b0810",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/beacon/same-http.keep-scheme.https.html": [
-   "75d150dba77f2a495f0e8561353f128b8a6b6fe6",
+   "984b353c92a0b0e202cca5343a71616065df1e2b",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/beacon/same-http.no-redirect.https.html": [
-   "8203cb7e1dff8c95023d9ee0bb8071e5ee4f9777",
+   "46234a7168379884f162f6ed5842440f05ce6e7c",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/beacon/same-http.swap-scheme.https.html": [
-   "54114ff754bed04baa91e40420e5261f6393c2a4",
+   "27b956ee0b211fe04701cfd2688d8e8e9e5655c1",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/beacon/same-https.keep-scheme.https.html": [
-   "9a7cc113b335836f2b0cfd1c9536a18dfae49c68",
+   "52f3cb99ada0cc777fb80f0ec6195144c92b584d",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/beacon/same-https.no-redirect.https.html": [
-   "86c56bdfef5fd6ac2e58955b0cd6ea635df165d1",
+   "303e047ba53c9e6e8ab60a757a8b02bbbb8750c2",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/fetch/cross-http.keep-scheme.https.html": [
-   "d98fee3b05f6bd04084047543bbe6dc1d13bb9df",
+   "ea9697785b3390ad80c90d0f9a431aae5aecf213",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/fetch/cross-http.no-redirect.https.html": [
-   "6f111d1262329a6a76f7fc28d8d226d38e3e2e50",
+   "8a29645586171e39db511bd04cbc3d2f58ca0134",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/fetch/cross-http.swap-scheme.https.html": [
-   "0b35f8b6d90a5751f3c42233c454b5bdcd9fc71b",
+   "c080c346ccba1d790f4928fedcfdea1c6358eda1",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/fetch/same-http.keep-scheme.https.html": [
-   "b96a2125eb64062371982798c9d0b5e01dc1aeab",
+   "ea9c18d6a81b4e9c355286d9f0f19e416665d511",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/fetch/same-http.no-redirect.https.html": [
-   "280a9cdc6b80113986a34d1ad4822f8965f8df93",
+   "dfbd794400c75b35558114d94c83d9a9a47d61d5",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/fetch/same-http.swap-scheme.https.html": [
-   "a9063e42946cd3f8026cc7b1e361fa2375c44dc9",
+   "2e6296c483cec27a18c742a5126ab2a81fd797ae",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/fetch/same-https.keep-scheme.https.html": [
-   "4e2f750fd1daab399b4c2217ffa3f03fefb3c651",
+   "34f1b72647cf216b7208f6ea3b9c31ef30361f4f",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/fetch/same-https.no-redirect.https.html": [
-   "74817ec7dae18b74dedf21421437a028a9b28785",
+   "71a29f3f2d4b26b5b189352453e84ed8eca1782d",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/img-tag/cross-http.keep-scheme.https.html": [
-   "5ec2714a6c420857645f88cde263cf32c56c6510",
+   "30f7407b971bfb8ed6aa0a0c63635d1fe7fadd16",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/img-tag/cross-http.no-redirect.https.html": [
-   "27de3169b9065687bd1e0f787ca1a34e8cc77843",
+   "846846cbae8e21acd2da4378b599030b13513a61",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/img-tag/cross-http.swap-scheme.https.html": [
-   "efdfd63e5467e6a52af467c1d2c2a7a6e655f019",
+   "1da530e726d4661d9174bde71acaab77c5343fd8",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/img-tag/same-http.keep-scheme.https.html": [
-   "774ca7f99a3ec0063ac8ee77f5c572745af03962",
+   "be6065356c79edae716a8ebf46d779beac8217a7",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/img-tag/same-http.no-redirect.https.html": [
-   "3590a140a1d33b0c40ac2d0aca4711dc48ef25e4",
+   "7c2e96c973bebab741f400b5e2e15379891c08bc",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/img-tag/same-http.swap-scheme.https.html": [
-   "09e8d424ffee431d6eae2c7b6287f20ed818c431",
+   "ccbcf08d624e60f0d5f1a80b0d2d1764d6f6bcbf",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/img-tag/same-https.keep-scheme.https.html": [
-   "d8687bd8b6e2260c57f48f8d20e150773c327487",
+   "83297b91af32c31a15132e9cfab61457f0ddc818",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/img-tag/same-https.no-redirect.https.html": [
-   "ffa2e47c8a158cb17c30c8e95b67dcc277deb210",
+   "951b0aa295ec5846cbc86cf3ef8634fc05c507d9",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/link-css-tag/cross-http.keep-scheme.https.html": [
-   "7ee418573447506286e5148c38dc42a12bb39869",
+   "4ca29b6c059db7f2998901bd5e245be8e4608a96",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/link-css-tag/cross-http.no-redirect.https.html": [
-   "be00ef5d27de4ba371ffbf13de572ad6027ab5fa",
+   "edcf944a7489fa1b33b0743838918e116d1849c9",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/link-css-tag/cross-http.swap-scheme.https.html": [
-   "9bed22b198fec904c3ebfca6687b504b9fb10944",
+   "c408c72d125c499b9f440ab122d50d4c1dd0e393",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/link-css-tag/same-http.keep-scheme.https.html": [
-   "3849927c9b388ae822d9b9bb4765cf9278f2112c",
+   "6eabfab8234e9d33a4149d2a22413fa750cfccbc",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/link-css-tag/same-http.no-redirect.https.html": [
-   "cdde11b1449e35b83879a88eefbe660cf4f2f50b",
+   "4f823de23e66c202d2cd93de879536f7409b3cc0",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/link-css-tag/same-http.swap-scheme.https.html": [
-   "e9bcc9e6bf7b9f66557c81269cc3801b4dcefd8a",
+   "96a08a133b3a998154b87c08af7afc28d92f164d",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/link-css-tag/same-https.keep-scheme.https.html": [
-   "493d92e34f9dcb570443e0466f2da990c0dbc58f",
+   "8f3414e493fc658865d2121c2b47c7aeeea3619c",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/link-css-tag/same-https.no-redirect.https.html": [
-   "69ab08e8f306604a464d529d8f559746d78360fc",
+   "b9b3a61d3cda8852ba6c1545f5bdc7e3b2793abd",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/link-prefetch-tag/cross-http.keep-scheme.https.html": [
-   "30594cc754716722bb9d6c31693a8e7dca087f4b",
+   "cd95c8c3aef41ed8a24e7a5e56285001f4b8583d",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/link-prefetch-tag/cross-http.no-redirect.https.html": [
-   "533309e93b363f28fcdf576ca660b27941be4c9a",
+   "a21b718800e6f18c5ec96fcab3a1a25947497b26",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/link-prefetch-tag/cross-http.swap-scheme.https.html": [
-   "5f8ce108fc61010716025b797c056e3abff7b1e2",
+   "99483c30b02541ee6067f67895b4d4675e984955",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/link-prefetch-tag/same-http.keep-scheme.https.html": [
-   "076ecb8328dedccd92e9f743451ec829cd542bb6",
+   "6020508010cd804b201fe2dad01a0ec6dfd8fe2c",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/link-prefetch-tag/same-http.no-redirect.https.html": [
-   "534d3a134288ffa469d38370593534c792257e39",
+   "8b6714264730f29dee3168cda404bceb40fa8e1f",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/link-prefetch-tag/same-http.swap-scheme.https.html": [
-   "cd87071760b6235b8382a0519b430b31c33353dd",
+   "29a0d46a8a51b66615a3584c6301f0fd42f43f5a",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/link-prefetch-tag/same-https.keep-scheme.https.html": [
-   "1f1b6d12361497b2bd48aa7359783f3d2f38f478",
+   "0ba438eee6ea620df44100cc2a938fcdf5931490",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/link-prefetch-tag/same-https.no-redirect.https.html": [
-   "f8cf49fd07eaaa34aadef4ed5f47ce135dea0e9b",
+   "555c53485eca88bf4674c4cd6198b41db1cdfb1f",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/object-tag/cross-http.keep-scheme.https.html": [
-   "de3c2cafe69ddfd53c3af562df08261153d4eb86",
+   "828db98e0dba2751e6d20e435228c2c9ae9801b2",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/object-tag/cross-http.no-redirect.https.html": [
-   "ee9625d31ebf9f00acd07a7d6ad7a3a91d762d6b",
+   "1dace197dd27051a27e4e22186ac6cb41e6fbd3a",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/object-tag/cross-http.swap-scheme.https.html": [
-   "ab0a387f7c5ab942025eaaaf46073a2ac47d7d32",
+   "30b3c5bb3cf1da35d25b2c3fb10fbcbac4f79cbf",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/object-tag/same-http.keep-scheme.https.html": [
-   "edbb3f9f2db3c06c9bdef86de1fd2e940ded8cdb",
+   "ec9eb5b8f2c7bb853bd121649bf7f316f36165f5",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/object-tag/same-http.no-redirect.https.html": [
-   "72ae7e512a62f12b84f2a3b7fbd2afb5add7baea",
+   "4fb39defdf916bbb32ca5f7e9cab1873d557ee2b",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/object-tag/same-http.swap-scheme.https.html": [
-   "fb969da6369155f1047a398479b91b80b902ac4e",
+   "01676bab33803db2d33224de4221284becdf6e25",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/object-tag/same-https.keep-scheme.https.html": [
-   "c537a645e006a6f8caf8960643ce3a24b6969490",
+   "ac1e85311546285d7e40eb1ea3cbe67c10b50bea",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/object-tag/same-https.no-redirect.https.html": [
-   "ea3e82ac9f4ea031b550237fab47942954215a93",
+   "e248122edeb61ef753dd8f70d4dd92e956e70e88",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/picture-tag/cross-http.keep-scheme.https.html": [
-   "6ad20e5a28bb603f278046f9f22d160e47fed739",
+   "6417081f9fe189dd6a7ae84e754a88b8203e9a44",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/picture-tag/cross-http.no-redirect.https.html": [
-   "533eb0ba8fb65fa701bd086ce97dacc716f76624",
+   "2c3f9e1cbfacab2594f94cc350c4f939c1dc1f63",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/picture-tag/cross-http.swap-scheme.https.html": [
-   "6c531f3cbcfd698bb81fddc2975662ed0d056a4b",
+   "886e6ef82fd8187eb7bd327e7c6ee934b36bb430",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/picture-tag/same-http.keep-scheme.https.html": [
-   "d46d6f40430aaf23e7e6daefa7ad3e24cbdb042d",
+   "75289034c921de435915c60f30c8d2bfc7290ce4",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/picture-tag/same-http.no-redirect.https.html": [
-   "981d6c5a2ad536bbd6337fbbdbb41c5a6e30b41e",
+   "52a421f7428cd1dca2879505ab1c8c06c26611a7",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/picture-tag/same-http.swap-scheme.https.html": [
-   "68233cd9b21eeb8cee00e1c38074694f370deff4",
+   "26ed43eca371636bc974caa31f9fd811641db4f4",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/picture-tag/same-https.keep-scheme.https.html": [
-   "e702aef5b02d5260107286f07dad8b7ad765dcfe",
+   "6d10711d638f4748a864c28ca680566d3e477d3d",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/picture-tag/same-https.no-redirect.https.html": [
-   "b26d44db206e9780a46d216f713165ae270eaeb2",
+   "fe4da56e32a76755c5448b710c006f88b6597020",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/script-tag/cross-http.keep-scheme.https.html": [
-   "727fc11dc385f59e8df94fe8901007a9572a6d07",
+   "a5f903c2fd262253b8876177a0416195fd52a6bd",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/script-tag/cross-http.no-redirect.https.html": [
-   "9b416e87fb1434b37048d00afb0e9916a45abbbc",
+   "f3594a9c55c1dd90503a0b0567b462fabca3407b",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/script-tag/cross-http.swap-scheme.https.html": [
-   "fd6c3be8ae39572851ff5b3d0d12fe76d74d2192",
+   "1933b3753a23bb5a5b657c9888dba0f1697658c8",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/script-tag/same-http.keep-scheme.https.html": [
-   "479be7863485bd49ff87e1ca0b5d724172ae134f",
+   "bfc3391e7d4ad99ad2d1f9d3feec688848c8deee",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/script-tag/same-http.no-redirect.https.html": [
-   "c32977196a997ddff7a8272723ba8bf726927941",
+   "712f802dc160d1ee8314b1b408b30ce31458eca5",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/script-tag/same-http.swap-scheme.https.html": [
-   "ba13e682fdb2b710e7f930cf2d7f578681cfc09c",
+   "c70728730d811944707bfdef009ed248cb5b999b",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/script-tag/same-https.keep-scheme.https.html": [
-   "01b37600deeed9610f5f8fff92b2debbf2fb90fd",
+   "d58c20a049b88b5af4a233194c217cbd53468112",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/script-tag/same-https.no-redirect.https.html": [
-   "7d240ececc162eb02c01250efe2fd26de7b73980",
+   "3d29665067f481ae779acf4d8dfd21330fec92e4",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/video-tag/cross-http.keep-scheme.https.html": [
-   "9529cf7e8d3e5ea21dd9071aae907c98153c4c67",
+   "f40396db9383a2ef4e8390a67bb410ada4166199",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/video-tag/cross-http.no-redirect.https.html": [
-   "ea35f29833d4ddd3510b6c0b3c8e717cc2968abe",
+   "98fa4b69498e4e44489c2de41cf0ee68b4c0183c",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/video-tag/cross-http.swap-scheme.https.html": [
-   "4b469e65810eca0468913f0b6c9ba63e8455ebdd",
+   "d521ef72c982abd5313c44c5dfc7277f9554679b",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/video-tag/same-http.keep-scheme.https.html": [
-   "8020ee0e8ad2adf5f1409aa5f13c1004a0042931",
+   "5f4696c44e77e1d284b6e008e5692cdc118e46ff",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/video-tag/same-http.no-redirect.https.html": [
-   "fbaa49b7a9a8f96e59a4dd86946936c5bef55fff",
+   "4c3d2b8a0fe4a87b15f626d3d573389ba71ccfb8",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/video-tag/same-http.swap-scheme.https.html": [
-   "f0b76254b46e61df1f63338b7bae51ccbaab95a4",
+   "2aef0959dde342856a56489149fc1219b49a3436",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/video-tag/same-https.keep-scheme.https.html": [
-   "79b3c0a284824e37bad0910c63f2743928d3edbe",
+   "89f1f67de62d68ed9ef729273fe0c5ca2b1d81ea",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/video-tag/same-https.no-redirect.https.html": [
-   "c2c7f8723c4a54c1d78e195523d2ebef8bc4a922",
+   "2860df22162786e14fa502378dfe2f88fd092c6e",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/websocket/cross-ws.keep-scheme.https.html": [
-   "18ec117f46185af05e8cc9633f9aca1a66e9b2b0",
+   "1c5302b12c4550ed3002f7f4ea3d547518472c3c",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/websocket/cross-ws.no-redirect.https.html": [
-   "1673464aae0ac4dd1a2277302b2127b8cf9e0722",
+   "8437326b180101b12b71536dac8f2cbd56b08c67",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/websocket/cross-ws.swap-scheme.https.html": [
-   "bd8d6fd79676c2ae39b66728fb069dc319ad665e",
+   "92fd464c93a63eed27a349700a0672c29036c7f2",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/websocket/same-ws.keep-scheme.https.html": [
-   "b5080134174ee64490a579e5da9844f22dc2388e",
+   "ac11208f23e95a97f6213fe63cb959301d204637",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/websocket/same-ws.no-redirect.https.html": [
-   "9f168b080faf350f0350bc8aad907f7f8f87f9eb",
+   "967445ee8d5dd64d2a9a71bc1b5413810519bbae",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/websocket/same-ws.swap-scheme.https.html": [
-   "24445374ae51caf489c1ea8018a9b64d7d794c83",
+   "273712aad9bc9b07a5e0582ef934a11089900648",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/websocket/same-wss.keep-scheme.https.html": [
-   "b397c4e2a61f687c9dfb248da432f32c46dbea17",
+   "47619170144977fa9bc212e7969d41136c00ff6c",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/websocket/same-wss.no-redirect.https.html": [
-   "d19674db08c4c8db3fed0d7f53353822dc034bf4",
+   "ed5c0ab8a77e14fb8b6cd7deb6ff2a3ef0b41b97",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worker-classic/cross-http.keep-scheme.https.html": [
-   "85290c11b7165a1254ce81159be354805cafce3b",
+   "8a915c29f9f45c37c998c4caa70f819c895f4d06",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worker-classic/cross-http.no-redirect.https.html": [
-   "0e125bcd8beca51cfccc70e511262ff21f50cc65",
+   "5aabf759341371ad8323399f83c9160407e3ddca",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worker-classic/cross-http.swap-scheme.https.html": [
-   "b92b11d0be8678052174484815d11ed9eeea260e",
+   "90c204d7a0d0dff099916a14a1eeebbb15dbc3e0",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worker-classic/same-http.keep-scheme.https.html": [
-   "213cf96bb28728d17dff6888b5176f9ffd66243a",
+   "93668db49e4f3d79d39ab72bc525db6353a4d74c",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worker-classic/same-http.no-redirect.https.html": [
-   "5ec4866157a941b1a9319af6ab60089a115b4aae",
+   "8521e37281c964ea9a226fd1bdcfc1dd33c169b6",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worker-classic/same-http.swap-scheme.https.html": [
-   "c75044d431019681931a0031d21c5fad2871cdb9",
+   "d5f79ad60212c6ec0b48a5be3e9c6a492d4b7a69",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worker-classic/same-https.keep-scheme.https.html": [
-   "5c5d73b35e9d76b8bb55cc56f98454bee4547151",
+   "042bd14fa8160b38c7852c168748a6c70484e4a1",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worker-classic/same-https.no-redirect.https.html": [
-   "4aa31ce50e4f91198ec3a2c13ffcaa282993cd3e",
+   "05b13b680a532429a9bc73149c5249717f8b263e",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worker-import-data/cross-http.keep-scheme.https.html": [
-   "adba87787174cc6734897d5211b367eeaf592581",
+   "60963f90586f89117f898378512ad682dee5e275",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worker-import-data/cross-http.no-redirect.https.html": [
-   "7b54a338fdfc9e7f8a55eb7eedb0dc3116224a3b",
+   "7ced3b86cdbc9deb1af44a99f3060df26b4caa08",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worker-import-data/cross-http.swap-scheme.https.html": [
-   "57d144abd756bf9c32b15ada1f7fab60c8b861af",
+   "15711a976bf846c784391aa816312950a05c001f",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worker-import-data/same-http.keep-scheme.https.html": [
-   "cb127cf179284c4668d296994ba2cba6bc4603ce",
+   "4a1d376683949f31b147e1b3e535e36dc0837515",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worker-import-data/same-http.no-redirect.https.html": [
-   "768fd4cce7fd8bb9eff831556fe5c26667a3594c",
+   "b8c53bae221bdd5ced76632eff13fe0b93ea04ae",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worker-import-data/same-http.swap-scheme.https.html": [
-   "736f6bce3798287de07cb5d5928160d8db592661",
+   "be403a893c9ccef130b030c1f1857143510781e0",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worker-import-data/same-https.keep-scheme.https.html": [
-   "5be23a031177ebe34b6483f5f2bcf5e496dba92b",
+   "06a8f47ae42d480c0d67bf08c9c6cef963fdc969",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worker-import-data/same-https.no-redirect.https.html": [
-   "858a1528043a9d1a7132b37c299c5e34fa6b9bf4",
+   "211bd0d29981358e1dc754a3353f3a43219a34b9",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worker-module/cross-http.keep-scheme.https.html": [
-   "a1e6f61e6b7e2db743dfb7027979cc5f0ce204aa",
+   "69dcfb7e5cb5b30f24e0b181b3b3968542673f35",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worker-module/cross-http.no-redirect.https.html": [
-   "a95d2061b68e1c6df2cde0b52f82692ff0dd3bfc",
+   "816e3449092a398f12a7287b4d2715764aea56ac",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worker-module/cross-http.swap-scheme.https.html": [
-   "c396cdc20baa6bc5ac49e52abaf58705c1350488",
+   "9e167de1486d409caf0ba5ef4b41d434ad06315c",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worker-module/same-http.keep-scheme.https.html": [
-   "20414a3dac3157932300b5d8e284713af3994f27",
+   "75e103e634366ff03e22e11d32b0cefed280e1ce",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worker-module/same-http.no-redirect.https.html": [
-   "9397a3523e89853b6e3c2df662c37666550f32f9",
+   "f9e963d8dc778e2f59687decd714421babb676ad",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worker-module/same-http.swap-scheme.https.html": [
-   "0340366bdf20a1facd9f67ff46c510f77ef380c7",
+   "f0397f11b69a19ca884dfcaba8abd571d4ed1aa4",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worker-module/same-https.keep-scheme.https.html": [
-   "da0e808f1847ef6614b3fce1f8bad0be41c114e2",
+   "b81758e5b79fa6fbf2b50c2118150087b06caef5",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worker-module/same-https.no-redirect.https.html": [
-   "a009215e6013593c5ee461e35f247be61653f9d1",
+   "a7399e2dcd2647a9f440cbc77c92238758baa795",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-animation-import-data/cross-http.keep-scheme.https.html": [
-   "0271fd3694cb9425474f8a7ae4c09d484fced9cb",
+   "1c26e0c6e493cf60706e3dac9b527b18c12bfda7",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-animation-import-data/cross-http.no-redirect.https.html": [
-   "2a1158bbb9974f900dc1583d73907143bd1d62c0",
+   "3ba399bb528163ccf6ad67fb052dc51bd75dfdfc",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-animation-import-data/cross-http.swap-scheme.https.html": [
-   "d9f4916bee788fae5cb5c0cd5672d92ff33f6d34",
+   "b5950d9318f4ee0ca970b39299dda05a2fb1c5d8",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-http.keep-scheme.https.html": [
-   "5258084ec5e95ff7d100bc5c59043ceca78987ec",
+   "b9a80c07de42b59b1cc1d6ed6154113749041269",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-http.no-redirect.https.html": [
-   "437db2c854b14007254ab39eb3849d3aa6df36c4",
+   "1b2f858a7ab7a6cb620da2e322cad277cc568877",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-http.swap-scheme.https.html": [
-   "48fb79a3021ca1f0c99c10f8533aba9f3b4c9bdd",
+   "6c8e517bf53137601c528131011d2571b80d5859",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-https.keep-scheme.https.html": [
-   "49a5222cf78b89f65bdbae0222de68de3681a5a3",
+   "403fc3417d7736bcd08766fca50fe6bdc8a10b74",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-https.no-redirect.https.html": [
-   "b111698b904c7fab5a17076fdd5ce57c27c05c10",
+   "89f4bd68af83f3ff61d48c0adee951db5453cf54",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-animation/cross-http.keep-scheme.https.html": [
-   "5973cc7ef1fe8cf481e46c2689842cda3703c997",
+   "a2eff5fdbb029111ef79b73ba5faa9abee764fda",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-animation/cross-http.no-redirect.https.html": [
-   "6f8ec890f139482214c7a310c0d1a6c81412b83f",
+   "d778e5c873ce92ca21f4071f643c2af8ec8b8d2c",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-animation/cross-http.swap-scheme.https.html": [
-   "21e8ec651d0f349647ad38049c9911b533b6ee02",
+   "23b98c374e42dd018b0c0574cdd3fd2b2abcba24",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-animation/same-http.keep-scheme.https.html": [
-   "9f57d2e8d762400181cb5efd865e83057cae2a29",
+   "c35a70d5bd95e9f514599e2d158315ba176bb4ac",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-animation/same-http.no-redirect.https.html": [
-   "0e4e5dab66a511a902c6d4b45060534da2ae2bd3",
+   "b4623495821e4d2e66ad413030973de97d3a33bb",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-animation/same-http.swap-scheme.https.html": [
-   "97a512f434d5735cdcfe0342f7c6b031a19fb6e5",
+   "fcb0b175c356ff219ba1892bbef5d38dd2f1b72c",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-animation/same-https.keep-scheme.https.html": [
-   "91ef446211f449504bf435983728f036a493fcf0",
+   "1afc5a269779c869aeba2abd3bd4887c2e2f648a",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-animation/same-https.no-redirect.https.html": [
-   "a5f042be15096ca0b6105a165051f369d8f5a375",
+   "ed7892242a975165bfaf66bbf3ef9ea330b1a04f",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-audio-import-data/cross-http.keep-scheme.https.html": [
-   "6e8da756204ef8c4fa3b9eec351ced53967a9b54",
+   "fedb12fcc32cbeac63f789f9411ea307c2cfe87e",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-audio-import-data/cross-http.no-redirect.https.html": [
-   "32fa16408b125824f00ca18b22ed9181342c7092",
+   "657ed84d2bb6d79968f5a62081d2327c6a1cd512",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-audio-import-data/cross-http.swap-scheme.https.html": [
-   "9fab4e28179ee55f8a904f04d278d6d823c61403",
+   "1ccb5f30cc515fc847094aa3a0afdd2f1ebac56c",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-http.keep-scheme.https.html": [
-   "81a971be92176761e1e710901c9a11287df382c1",
+   "caa5f4b57e4e424d6e5953400eec225a4f760f1d",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-http.no-redirect.https.html": [
-   "5d434c0504716491b0e44d97cdad252698aed425",
+   "7bf0db17cd5a7d8302b5a8c872bdfb26f6c6ccd6",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-http.swap-scheme.https.html": [
-   "431caad8a022f1e5e255ecc4e3a3479403693083",
+   "4a91a21f0dd3b462136d0a536c417592376bd107",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-https.keep-scheme.https.html": [
-   "e569aca97f8baf788a768754ed646772cf146ea5",
+   "d7d0f8c6b883b0b7b1fe73b2c30d14c030f951d5",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-https.no-redirect.https.html": [
-   "00a1085db0321eb9f9cca4e05959ad4c269334f9",
+   "78472a912426721ba3f6cd2527c27d3196ef389e",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-audio/cross-http.keep-scheme.https.html": [
-   "1f4d8e61eeea8109f658fe9a00a9347c651e76e0",
+   "2cbded7e61461bd2127d71b90fc8712d6fb04952",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-audio/cross-http.no-redirect.https.html": [
-   "4027b3ec8585f4638bdd9d7bd2b2c6362ad08cc3",
+   "4e75da94e531ff9b44f78948e4f53af04d6d807e",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-audio/cross-http.swap-scheme.https.html": [
-   "90d4553b6b8157c7b2fcb59a78f7b91bc59c2d0d",
+   "98faf005e955450e214f5738d9e4a9e8c8e6ee1e",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-audio/same-http.keep-scheme.https.html": [
-   "81bffa4220feb7340c3431216a4b52f876c64744",
+   "4da5197252c3b3afe8dfd230e63750a9110cf70e",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-audio/same-http.no-redirect.https.html": [
-   "31e123c95f9f8d07ef4a6e20994e0ff0d3561df5",
+   "709562268b2829d8c15ce542703a434dcd0b4c4e",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-audio/same-http.swap-scheme.https.html": [
-   "ae01e10930f4c8598f0614e07ea1655cc0a16a2c",
+   "991ddf81804dd2b2ef99579f74240d0069c69d2a",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-audio/same-https.keep-scheme.https.html": [
-   "131bfeb17377443b06fcfd4a1aad10eb06dd6e65",
+   "f199071a9596b8038a9c527f4aa5a5c7c81f91c2",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-audio/same-https.no-redirect.https.html": [
-   "96e0e303b99129075c7c558bc20e9bb9e289b92a",
+   "76b119d51815fd92812aa7acd11a6bc3ac747035",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-layout-import-data/cross-http.keep-scheme.https.html": [
-   "d6de7f78362ee6d1e45a13beefef978106ff1ac7",
+   "4f5d2f6030a23e0280de1ff8edb1e7b6647e6243",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-layout-import-data/cross-http.no-redirect.https.html": [
-   "5109c5b45f1b8f9a53e9a0aa9402665939b3745b",
+   "09aa789768874951777302daa228bece783e959c",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-layout-import-data/cross-http.swap-scheme.https.html": [
-   "9e0eac105f48453eca8f9fd4aebfdbb3ba7076ed",
+   "345d3d600188a29dad5a129cd046d9c0ee8a22e2",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-http.keep-scheme.https.html": [
-   "8c1d39e2e53273491463d19e272003285ce9e3c8",
+   "529c85c68fd2eac97bde46294c619d8abd5cfde0",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-http.no-redirect.https.html": [
-   "da24a8a50b4915c521cbbb800637dc827985fcda",
+   "ff88cbd4453945cc18a3498190b2392e5ddb2ceb",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-http.swap-scheme.https.html": [
-   "7ec5888d3cd899820e5838a074c029a338312ed0",
+   "5fd88554beea6c7cf7ce17679a35aef17544a340",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-https.keep-scheme.https.html": [
-   "0609fa835c291b72ba50e374a7fb65b2e74321d4",
+   "f834427d90692cc606b817977a87caaef3d2d23a",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-https.no-redirect.https.html": [
-   "a55cbc20b3f17030d1a04b96505641d670085270",
+   "06138a35960cdcb54ae3ec22926a256cd92b2f46",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-layout/cross-http.keep-scheme.https.html": [
-   "e96a0649bdb469a62e75bb4db06139a23c8853c8",
+   "4bec395b89bccfb3078bc626dd9750ae4cc0ba7a",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-layout/cross-http.no-redirect.https.html": [
-   "9367a0e6ef6ba1a4ea4b7925d6e16d7c520aa836",
+   "5a98e96931578ebcca310c4f134ee5a2767f161a",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-layout/cross-http.swap-scheme.https.html": [
-   "5dc4ebcd7f8e635ad34efe46e1952769ead83b33",
+   "e4ebe6eec9eb13e494a1836b004d19a3e1e6d19f",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-layout/same-http.keep-scheme.https.html": [
-   "d2840c520801ef551795bcf055d05d73e9778f83",
+   "bee78809a5c5c266fbbb6018a46eff3cab6b54ef",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-layout/same-http.no-redirect.https.html": [
-   "b3b9c49faf3643d137cd7cad6814367b9be5eb6e",
+   "18102d6d2fa71d923f0cdcda2acdfe1c7a14b542",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-layout/same-http.swap-scheme.https.html": [
-   "ef03e297e96eadaf4a8975d23519b9b149090ecf",
+   "5b9ae888b2547d9d926a385f81d8b4cea7a2e422",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-layout/same-https.keep-scheme.https.html": [
-   "fc92036fbaebea1967e237a256d1141b14263797",
+   "a2211cf181ff97c5911902c86d604c1744e49ed1",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-layout/same-https.no-redirect.https.html": [
-   "45dfa55e2129a68a9c250ce81574c0eb0a8fbfc7",
+   "c16b9831bcbb691ab36df73a9aa21e8a0f939920",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-paint-import-data/cross-http.keep-scheme.https.html": [
-   "e881494b92bdf7867c12ceeacfae285bc1bae4b9",
+   "a483e48787d47f703eabbbd38dfbfaa85aa826c4",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-paint-import-data/cross-http.no-redirect.https.html": [
-   "afca8013aad30e6d40c47918d1a681a9ca09a5bc",
+   "de0e2d31f32951c12ad99a82ac4a285e9040cfc0",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-paint-import-data/cross-http.swap-scheme.https.html": [
-   "582221b6ebf1995bdb581c765456be6776e52faf",
+   "bcc80e96055540d926691869c840c153a592b8b3",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-http.keep-scheme.https.html": [
-   "fb9a3a471be6e5113d2429ed5465aeb251b0e9e3",
+   "8767eb58485a33cfbeaf2be7960bb38d8955b34c",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-http.no-redirect.https.html": [
-   "1c5ac976e991c73e78737371ff01509f74d0dec7",
+   "a4dffc09951ecc621436e632ab92ee16682f88c7",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-http.swap-scheme.https.html": [
-   "ff4a8e85b2b7b75ba501e914b1daf3909c04148d",
+   "5242d8ec951b1c1bf50425075441f23988f09ef4",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-https.keep-scheme.https.html": [
-   "cc89ca597315ef4f7ad3ebc816f23e8c951e1442",
+   "b1814df609cc59ecf0432343ce46622281f9bcc1",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-https.no-redirect.https.html": [
-   "f61e2d7983a011d606dd0b3772a2f587b9af68ee",
+   "14fa0ffa3ecbadca27a40e67b81d3014d93d913b",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-paint/cross-http.keep-scheme.https.html": [
-   "8ba634d1be61bce28cf4ae7a626a16c13ad24f3f",
+   "b8a19ccdb2646485c84ab4ec53c8c340594a4b6f",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-paint/cross-http.no-redirect.https.html": [
-   "216be7f865046f9fc2b15db7182c002ea58c811b",
+   "01dac7c6e1dfb50e0e6c5c26fc6526925a82b0d2",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-paint/cross-http.swap-scheme.https.html": [
-   "1340df63bfbc16057a9ea171464ec6aa9fc2746b",
+   "92eea339a7c37bf8a6c9b3cd7febb272b961f28a",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-paint/same-http.keep-scheme.https.html": [
-   "a4ff29a8ba3ee2d3cee2539f1f6c42fe5d1b1ace",
+   "88bf23e9270120f407b0a5b073b14d4129495168",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-paint/same-http.no-redirect.https.html": [
-   "884c56348218c643122316d591242e3fd24ff99f",
+   "037008e4c66ed75581667404637f668b7d75cb49",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-paint/same-http.swap-scheme.https.html": [
-   "bd6fcbbb06cde492e30227b3110a2cc5044ac632",
+   "c758770f96bc8bf4f8b6109334ef60a3d0cc061b",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-paint/same-https.keep-scheme.https.html": [
-   "a6b18616e2b2d05fcc0556d74f3740f846412967",
+   "337c8745aa6e7df22692fff7f033cb7ba2a0f261",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/worklet-paint/same-https.no-redirect.https.html": [
-   "6ddc092c5d644d37c76db329f52dd9caf763b272",
+   "053785eed75c8d584f7b34c273f506ed3d90d870",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/xhr/cross-http.keep-scheme.https.html": [
-   "9ff477cc49d68e3f55af822c71ea759fb3c27393",
+   "6d53b02630108b44f2e2dd5c3fef9fff31039572",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/xhr/cross-http.no-redirect.https.html": [
-   "fbfb8fbe7f922e676254bff78e1d44977a19584f",
+   "963c4196c28dc34ce666bee3ab79f6ffe1bc70a3",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/xhr/cross-http.swap-scheme.https.html": [
-   "fa55bdbe2ba2f6b73d565d9d7df1e63acedae3b8",
+   "17eec1450493217946163e73abcea52de23a10aa",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/xhr/same-http.keep-scheme.https.html": [
-   "8522fa36fb36c9bb06b4b44139def2b2761636c2",
+   "792a2901f485569d7c10d0ae401a816987f4887b",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/xhr/same-http.no-redirect.https.html": [
-   "1668b85c48be232779d448c5404035ac30816195",
+   "2feee7befe86f1ce155b2a2c18081beccc5e972f",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/xhr/same-http.swap-scheme.https.html": [
-   "98ed3608031bd80cecc4c824c28854c9a744ce70",
+   "a976fc107d48fea3219817a3c32168c686076545",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/xhr/same-https.keep-scheme.https.html": [
-   "e05e09b077fdb2293e7322f81cc561cb677ee1a0",
+   "cab77fe02d1601b852e5946535686f7424fed529",
    "testharness"
   ],
   "mixed-content/gen/top.meta/unset/xhr/same-https.no-redirect.https.html": [
-   "0c58b6aadec567aa382189b85ae96e2fd8db4761",
+   "b9bc0f4f535c530672bef274a80a7ab3811074b3",
    "testharness"
   ],
   "mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html": [
-   "9559ff59f253e902540ab29e6dcfb0eedea8157f",
+   "db3319196c8ffdd676d8525c29ce7e90ddb9f23c",
    "testharness"
   ],
   "mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html.headers": [
@@ -680134,7 +679965,7 @@
    "support"
   ],
   "mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.no-redirect.https.html": [
-   "54aa6ef413879b3fa8612771f2b1e271c79e4804",
+   "259e3e3f0555d501f06679afaf45a914522352d2",
    "testharness"
   ],
   "mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.no-redirect.https.html.headers": [
@@ -680142,7 +679973,7 @@
    "support"
   ],
   "mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html": [
-   "cb6fca62b349409f061a4420f4f6fdc34ba255f0",
+   "3b951b3ce925567df9f3a00121f3718ffcaa53d1",
    "testharness"
   ],
   "mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html.headers": [
@@ -680150,7 +679981,7 @@
    "support"
   ],
   "mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.keep-scheme.https.html": [
-   "f10f67ce9d0fb76c12ce6e6c3088f1a6ba2a79d2",
+   "6131d33a7a45de72b5304a783646109db310cded",
    "testharness"
   ],
   "mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.keep-scheme.https.html.headers": [
@@ -680158,7 +679989,7 @@
    "support"
   ],
   "mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.no-redirect.https.html": [
-   "331e7df75c52415015b006fc12870eb7af9f86da",
+   "35e79ebb8335e9f9c43e198aa03bafb17f5e0096",
    "testharness"
   ],
   "mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.no-redirect.https.html.headers": [
@@ -680166,7 +679997,7 @@
    "support"
   ],
   "mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.swap-scheme.https.html": [
-   "3d2410cc39e647b0df6a42b66e6f19c8d0767d17",
+   "0ee4ae798d3fac261839f97246422889726abb18",
    "testharness"
   ],
   "mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.swap-scheme.https.html.headers": [
@@ -680174,7 +680005,7 @@
    "support"
   ],
   "mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-https.keep-scheme.https.html": [
-   "2f6e11dd59aec7f84c6bf9042c8034fafec3b711",
+   "100a3066d41df625c048e178c83152ba1caee8fc",
    "testharness"
   ],
   "mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-https.keep-scheme.https.html.headers": [
@@ -680182,7 +680013,7 @@
    "support"
   ],
   "mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-https.no-redirect.https.html": [
-   "3e86f97729bd29e3c57da12480e81a8a98457c43",
+   "116fa4e0391b611105fec1ec074c7792c20b74a7",
    "testharness"
   ],
   "mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-https.no-redirect.https.html.headers": [
@@ -680190,47 +680021,47 @@
    "support"
   ],
   "mixed-content/gen/worker-classic-data.meta/opt-in/fetch/cross-http.no-redirect.https.html": [
-   "a1d639e507020a4a7c80c356b91b5589622fdf66",
+   "f2c47e27ae0f6e7c0f75451241ca97d46edb93ce",
    "testharness"
   ],
   "mixed-content/gen/worker-classic-data.meta/opt-in/fetch/same-http.no-redirect.https.html": [
-   "33e44590b321f294a570b84ad123146f2f2351e7",
+   "4584eebca895bc87312c1359f44f361238ad920b",
    "testharness"
   ],
   "mixed-content/gen/worker-classic-data.meta/opt-in/fetch/same-https.no-redirect.https.html": [
-   "9e9efae7fc65ff47333e1817e5d42dbf345f57df",
+   "0a0de6ec532e971912d1ad279177dbacfd49227b",
    "testharness"
   ],
   "mixed-content/gen/worker-classic-data.meta/unset/fetch/cross-http.keep-scheme.https.html": [
-   "9559ff59f253e902540ab29e6dcfb0eedea8157f",
+   "db3319196c8ffdd676d8525c29ce7e90ddb9f23c",
    "testharness"
   ],
   "mixed-content/gen/worker-classic-data.meta/unset/fetch/cross-http.no-redirect.https.html": [
-   "54aa6ef413879b3fa8612771f2b1e271c79e4804",
+   "259e3e3f0555d501f06679afaf45a914522352d2",
    "testharness"
   ],
   "mixed-content/gen/worker-classic-data.meta/unset/fetch/cross-http.swap-scheme.https.html": [
-   "cb6fca62b349409f061a4420f4f6fdc34ba255f0",
+   "3b951b3ce925567df9f3a00121f3718ffcaa53d1",
    "testharness"
   ],
   "mixed-content/gen/worker-classic-data.meta/unset/fetch/same-http.keep-scheme.https.html": [
-   "f10f67ce9d0fb76c12ce6e6c3088f1a6ba2a79d2",
+   "6131d33a7a45de72b5304a783646109db310cded",
    "testharness"
   ],
   "mixed-content/gen/worker-classic-data.meta/unset/fetch/same-http.no-redirect.https.html": [
-   "331e7df75c52415015b006fc12870eb7af9f86da",
+   "35e79ebb8335e9f9c43e198aa03bafb17f5e0096",
    "testharness"
   ],
   "mixed-content/gen/worker-classic-data.meta/unset/fetch/same-http.swap-scheme.https.html": [
-   "3d2410cc39e647b0df6a42b66e6f19c8d0767d17",
+   "0ee4ae798d3fac261839f97246422889726abb18",
    "testharness"
   ],
   "mixed-content/gen/worker-classic-data.meta/unset/fetch/same-https.keep-scheme.https.html": [
-   "2f6e11dd59aec7f84c6bf9042c8034fafec3b711",
+   "100a3066d41df625c048e178c83152ba1caee8fc",
    "testharness"
   ],
   "mixed-content/gen/worker-classic-data.meta/unset/fetch/same-https.no-redirect.https.html": [
-   "3e86f97729bd29e3c57da12480e81a8a98457c43",
+   "116fa4e0391b611105fec1ec074c7792c20b74a7",
    "testharness"
   ],
   "mixed-content/generic/sanity-checker.js": [
@@ -680238,7 +680069,7 @@
    "support"
   ],
   "mixed-content/generic/spec_json.js": [
-   "2f5212e9ff762d0f9e10a738120035beea618560",
+   "e49bbd91c9abcfdaccc51e0538f57734754728ba",
    "support"
   ],
   "mixed-content/generic/test-case.sub.js": [
@@ -680269,57 +680100,57 @@
    "6905a68e7901ce26bc1a363062304e1536604400",
    "support"
   ],
-  "native-file-system/native_FileSystemBaseHandle-postMessage-BroadcastChannel.tentative.https.manual.window.js": [
-   "4bfe84e9c4abf8738002168832fe59b7e6d72896",
-   "testharness"
+  "native-file-system/native_FileSystemBaseHandle-postMessage-BroadcastChannel-manual.https.tentative.html": [
+   "322b169985bf40e2bac1dba813e840e951f89414",
+   "manual"
   ],
-  "native-file-system/native_FileSystemBaseHandle-postMessage-Error.tentative.https.manual.window.js": [
-   "e45271c779341513de5a4400560012d68998f8dd",
-   "testharness"
+  "native-file-system/native_FileSystemBaseHandle-postMessage-Error-manual.https.tentative.html": [
+   "a503c7e8702957ccc1dba0224bd38aeb3589003c",
+   "manual"
   ],
-  "native-file-system/native_FileSystemBaseHandle-postMessage-MessagePort.tentative.https.manual.window.js": [
-   "408b32f13a317e060e88baee4ccca6a5f292a3a4",
-   "testharness"
+  "native-file-system/native_FileSystemBaseHandle-postMessage-MessagePort-manual.https.tentative.html": [
+   "4b57576688171377b2296c4595917a5b7563b1fb",
+   "manual"
   ],
-  "native-file-system/native_FileSystemBaseHandle-postMessage.tentative.https.manual.window.js": [
-   "6045812bff57037de8b1f4972059e8d8e0ee06db",
-   "testharness"
+  "native-file-system/native_FileSystemBaseHandle-postMessage-manual.https.tentative.html": [
+   "266238c4acc269b4a29b0f849f1807172ce3dd72",
+   "manual"
   ],
-  "native-file-system/native_FileSystemDirectoryHandle-getDirectory.tentative.https.manual.window.js": [
-   "cfe729cd1f1dd4b53f00b3b13cd53f64f84ca409",
-   "testharness"
+  "native-file-system/native_FileSystemDirectoryHandle-getDirectory-manual.https.tentative.html": [
+   "afd95af99d3bb0822ee00439d130c6602bf4643d",
+   "manual"
   ],
-  "native-file-system/native_FileSystemDirectoryHandle-getEntries.tentative.https.manual.window.js": [
-   "f27a44d12459cccbbe7192fe13104d77c68795ae",
-   "testharness"
+  "native-file-system/native_FileSystemDirectoryHandle-getEntries-manual.https.tentative.html": [
+   "858bf02f1fa2f5fd2dd01acc96bac149a02896fe",
+   "manual"
   ],
-  "native-file-system/native_FileSystemDirectoryHandle-getFile.tentative.https.manual.window.js": [
-   "0455cb800919ee353b7f2e87bf47b76ba075519b",
-   "testharness"
+  "native-file-system/native_FileSystemDirectoryHandle-getFile-manual.https.tentative.html": [
+   "085d4371c48271076deb04c3c399b0226cda14a8",
+   "manual"
   ],
-  "native-file-system/native_FileSystemDirectoryHandle-removeEntry.tentative.https.manual.window.js": [
-   "8905a7afdea57c974a9a06790df6b9e692d32139",
-   "testharness"
+  "native-file-system/native_FileSystemDirectoryHandle-removeEntry-manual.https.tentative.html": [
+   "cedb87587cee3b68f4edf76060679407f61b3c59",
+   "manual"
   ],
-  "native-file-system/native_FileSystemFileHandle-getFile.tentative.https.manual.window.js": [
-   "16c68c59b273663fb16847f121f38e03bb94cf19",
-   "testharness"
+  "native-file-system/native_FileSystemFileHandle-getFile-manual.https.tentative.html": [
+   "5a0b1d97b05a48c178cf86e6c766565fa87a7ef0",
+   "manual"
   ],
-  "native-file-system/native_FileSystemWritableFileStream-piped.tentative.https.manual.window.js": [
-   "2c0299df12e9577261cce2f68d12a1bf744158c2",
-   "testharness"
+  "native-file-system/native_FileSystemWritableFileStream-manual.https.tentative.html": [
+   "56ff51cd05a7e7088520ab0fbf77ff378a530b4f",
+   "manual"
   ],
-  "native-file-system/native_FileSystemWritableFileStream-write.tentative.https.manual.window.js": [
-   "0efacf9e607d990bccf185b7d84d5f45220338d8",
-   "testharness"
+  "native-file-system/native_FileSystemWritableFileStream-piped-manual.https.tentative.html": [
+   "f6c6e6009aadf2b4c37b7926dfcd06962701fefa",
+   "manual"
   ],
-  "native-file-system/native_FileSystemWritableFileStream.tentative.https.manual.window.js": [
-   "caf6fbd1c52a3cef603896f8ee98d9618e4dc92e",
-   "testharness"
+  "native-file-system/native_FileSystemWritableFileStream-write-manual.https.tentative.html": [
+   "280edc27e5ad6f7a18e5f4c476a189efd6418e43",
+   "manual"
   ],
-  "native-file-system/native_FileSystemWriter.tentative.https.manual.window.js": [
-   "25d8ee995857fa67be2c41f048e882ec473f739d",
-   "testharness"
+  "native-file-system/native_FileSystemWriter-manual.https.tentative.html": [
+   "fbfbd301e1659a7fac5273507358e4f712b53b3c",
+   "manual"
   ],
   "native-file-system/opaque-origin.https.window.js": [
    "2385c31a786a223e5cdc23856edd41a55af783b2",
@@ -680358,7 +680189,7 @@
    "support"
   ],
   "native-file-system/resources/native-fs-test-helpers.js": [
-   "bcdfd484cf2b8b12632c964e2b60a390c03c4225",
+   "d8137c399408cdea10c4b7d473cae36f1c85265b",
    "support"
   ],
   "native-file-system/resources/opaque-origin-sandbox.html": [
@@ -680494,7 +680325,7 @@
    "testharness"
   ],
   "navigation-timing/idlharness.window.js": [
-   "8cc3546b3c27a9d93ee5621584d83d56a308513c",
+   "504453b9aff1e7b497c64955a98dc384817f1ba6",
    "testharness"
   ],
   "navigation-timing/nav2_data_uri.html": [
@@ -690102,1259 +689933,1259 @@
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html": [
-   "7269ca1b26dceeb92dc7b3a4c4e0ca787fa1cf61",
+   "c44fee3779aeb4203e01a894bf1c644b89f9f908",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html": [
-   "cc10001e1afb0c991fad7cb51c1486e8eb3754cc",
+   "3b4ef7ebe0e97cc20d5c1e4f1a3320b8350c4471",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html": [
-   "c4778882c09053062c554428c1436c6920d7a542",
+   "43eaa248162da3278e00419bb5b9b3a3b8836b67",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html": [
-   "e412e74f879adab52672c655c6400b1be485efc3",
+   "f742a56db896a5805af6d8c74528291fdc0de01f",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html": [
-   "fedb3811d2e102b7963fad2ba7522f66fa7acfb4",
+   "913ad186493a9e63a1b12039e215759243c21129",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html": [
-   "d96a1d081c102f397dd15ca600933c80569a3ce7",
+   "844e13e124037b6944321c615284fc0733e6d026",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html": [
-   "694e8a328d96893fdc438df74715144db0f66f76",
+   "e98b08159c274706f964d3dd3f626989649aee75",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html": [
-   "22fe67a1868806985763448e3ca989827037e626",
+   "fafc95e951a4063a28eb8818a97921522c3e6126",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html": [
-   "d59ed7d953b1310057eb8bbf61b48abfaa483860",
+   "239e995b1d6c84630fe7439ead34ba2c472695ad",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html": [
-   "7d333bd1f0e6c7d28388072dc6ff10be1f874c99",
+   "c301a60c5113519a153876b8fdc3cd366984938b",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html": [
-   "6d74fa964196875a27cb01cbe3809ef522da7064",
+   "3bec1166bb5f9860ff36757a14e9b7d09ffbb5c7",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html": [
-   "80163171ec933855c24e0e1152abf4839e2052b8",
+   "7345a7fa474d379001711702311991899cd8dcf1",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html": [
-   "2b27dd5fa7045f1e38f8b2bb6f921acc1a34db0c",
+   "bb229dd93986bc064fb6ba9153ee2a30fed1f1a1",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html": [
-   "d6d4d6bb9d01512c2e569a74848a165e22a9bf48",
+   "3020fe48cad815d643901de832ffceb825c2648e",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html": [
-   "c7a32e5d0ee285498ecbdc0e0e272cf00419fb17",
+   "58d9c553e0707c37eb1991148ddcc93151220cb2",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html": [
-   "04131b2b3350a88c0e2569cb2583d3aab0b93516",
+   "1f884e98d46f6ff9b2f0297ecdd09337d97f76a3",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html": [
-   "91217a1b1f56d5979f948469782b508872ddab46",
+   "ce0748b7304b7c251a85cd799cea74f6d5258148",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html": [
-   "0c9f3b9a3d7e9f216aae6b6f86b77dccb15a11c8",
+   "1febea391c10d66b6bf604d02365aa493a761bbc",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html": [
-   "884b9eb1726adf3cf1e7ca3599e80e8aeb24f854",
+   "6c2c49c660b807b0e459f354d9756871ad3369cd",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html": [
-   "4012b20f7c3d9a31102395091ae6dfc4747c9e3e",
+   "01a012540b0bcf445a5637a1ffbf4eb34d747048",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html": [
-   "fdc199880de047aae7d92fd8a679846620f0bd0b",
+   "b966bcb7d74ba93f54ed20d75bb07b0fed834b92",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html": [
-   "7c9fece456b8ca9aa4c8eb6acf0947516c45d525",
+   "45da014db790dd0feb69548d4c069a8c1da04c30",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html": [
-   "7cbfb80140af15b336f8cff899b36daf7cc65d4e",
+   "443ddf03354ccb68b16d12ffcdc05f8f4af634df",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html": [
-   "1f01d72ebbfdcce10c3839b6e78b49a23a4de450",
+   "fd22285abde54232de1e0632e6bc6a53dfa619f8",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html": [
-   "16ec9ba4d28b661f56f6bce73e12ee41579fafd6",
+   "17e8baacc47b495b5175f6cd33a16b60a5c94559",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html": [
-   "27b073035aa4b8acfdab394b0c164a07d12021fb",
+   "d0dc648bf05af69627572298764d0105f90ef23d",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html": [
-   "5d5b14f492699ce73b56ebb304fb071ade3978f6",
+   "f3ac8e18f1fdb8ce5de3c6e8c23deda773901489",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html": [
-   "7db51dbe340826138c3e00bb11d0f635e7e73b4d",
+   "d425a1f5029142661f3147fc4139f1d75794f227",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html": [
-   "c8270f896ec1937f04efac4f740154ecaa57bf82",
+   "e0178946d8e6ce8e242813c4fc3d3cf191bc5a55",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html": [
-   "da7d8dc24c46bbba81b46fcd6c989575a2770beb",
+   "2555b7afebecc82b7f45d8061668baba62a5dfcb",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html": [
-   "908637bc501b4fa994a6f1e4597719cb12426c0d",
+   "a4e61555ffc6e52789ba98c1660853051a7af728",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html": [
-   "2407b76de649b0b780964222ccd950f67dca777e",
+   "d29b9f372c2476432a81d74f0ffa2e5e4f412aa1",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html": [
-   "bab2a50944b6e44880145bbbd156e8e3be333a27",
+   "e30b8b3e7ddd2d53cc57ffd1867afc8b3b6667af",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html": [
-   "8d3a921c4acbf386983bff4958ccd24435399d4c",
+   "bd33928a418e1bbcb368e1b53456ac0537c81a0a",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html": [
-   "59e03982a279ce7325e9be554b83ba839185bb5b",
+   "fb3ba0e6933cc937cbdf720fdd76dc2d4acae3c1",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html": [
-   "6c44ba0e6a3135dae10dd6c86ce63c2148093fe1",
+   "d3458df7f0b48f6b2463b962aa002bd265d0ad93",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html": [
-   "3e74519b4bc70737d1d04606f36f3249d01e9f7e",
+   "ea91563734ab40401529ac4072044d0aa5ea6221",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html": [
-   "7a016b222fe68cb95ef74e16e474ae4767d31cba",
+   "95388c332793f86717c878e3bd5d535aedf73a93",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html": [
-   "64d75afb49abe8598f76a8e2b1ac6e72206302b4",
+   "298d1d1b7ef546874eccadf7ab90e82dfbe9db14",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html": [
-   "8d0f21bd0c67079a587e4d3fa3292edc83af87dc",
+   "4e35f806fba9385a55bd274ada54981d42ea75c0",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer/a-tag/cross-http.no-redirect.http.html": [
-   "7414c8e633ba78465818377aa2ade48f8f4b760c",
+   "5a974e5142e72df5f68694c9b32a7613db1cf20b",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer/a-tag/cross-https.no-redirect.http.html": [
-   "461d2fe43bbb3433bd971cb60cf741acb5ef4993",
+   "e1f171c4cf26b61ed71904a3e10ba2c9b73b0571",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer/a-tag/same-http.no-redirect.http.html": [
-   "364c688a281fb5607adcac76a554aa61a7de185a",
+   "6b6560ccde71cfa2bfbb233da2e45c7288dcec76",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer/a-tag/same-https.no-redirect.http.html": [
-   "8de257c500bebf2f86e648fd368f39497b1a0228",
+   "aac77a683ba78c1b362218dbd4e2258433a7f3b2",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.keep-origin.http.html": [
-   "dcb7c8b4c39e7896f0f395fdb517712946595344",
+   "4b9d88c1c14ed297aea610af4cc21247e75a1f11",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.no-redirect.http.html": [
-   "99a5e73d0640f02faa1b5845a188eb9af5ad2e12",
+   "2c5ff6d24d7216c2f1a0f2e617b3abf2764de36c",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.swap-origin.http.html": [
-   "4c394755f51bb0cdbf9a390e3d5c63b3ffcffd33",
+   "8608779f79673906f4e1f1e730d01129f490ccf7",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.keep-origin.http.html": [
-   "523da9325278940854f81bc4bcaae02fcb5aadb1",
+   "f182c76f3304676b0655e36363f9da1c02724df1",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.no-redirect.http.html": [
-   "0c65dd3bee32499de1eed979d5d44a016f02f93b",
+   "a0cbaf7997cf8942efbbb9a65a0bcf3a54ff727a",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.swap-origin.http.html": [
-   "50fb9baa4fc099dd7faf8ba070813419c14e7b4b",
+   "e2df19f2ca033aefa6ffa9046b67ec2ba5c2b557",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.keep-origin.http.html": [
-   "8946cc15a1231280c58400ded5a5926994c84d54",
+   "74206f4af73af147e9e09e36f58b369a169d16ec",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.no-redirect.http.html": [
-   "4037c2fb7435b35fa461c755513c4442d8588ee1",
+   "9f3b43ffeaacf5ff1a206fe28d46ec5a0cfd7c64",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.swap-origin.http.html": [
-   "d9c17d636edc47f9ae4ebac467b5858b7646464d",
+   "a9dda250ca75973515e1c8067b9d676066d38497",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.keep-origin.http.html": [
-   "8e64d48c83c6db280fdab7d21a3db920953f406a",
+   "49e18c3f2cfd03d8588b74e53e268a8910172cc2",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.no-redirect.http.html": [
-   "d55ac0bef0f2f0dbf3d266e0e502cafecfae5fc8",
+   "affc33d286f60676b5fd31e8563e309600103df9",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.swap-origin.http.html": [
-   "1acc09e2c2d98f2e2e840b173fc2d868ebc1568f",
+   "053f4a6924d50bba2631d5e63d6caf3963ff58d2",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.keep-origin.http.html": [
-   "6242aaa9a388d7bd46860366af4da5844ea7edfc",
+   "150548dffd4ef682c49d55ff1e1226f1f0540fd1",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.no-redirect.http.html": [
-   "2016094423af2e8f6dd6693d219ffb3a7161b1bf",
+   "4b7f7186e2bd123675667fc8188024b4470b354b",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.swap-origin.http.html": [
-   "4c905c16579094f1db297495632029bc98d2d305",
+   "0b4ab2e534af496d2bfa7e2f1110cefc5d56eacb",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.keep-origin.http.html": [
-   "d62e9c01292ed1b73668fe03cfccff80fdb6aed6",
+   "09b2d692ceff5c65267b81bca28efedca8af1023",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.no-redirect.http.html": [
-   "1b77a0cf85ec3092ce6ea95856b93dce25a32a78",
+   "804384aed19185d0877aa9df447817c861639ff4",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.swap-origin.http.html": [
-   "40d2cff83b6b22ac4c2278ec3deea3cd2fe6089e",
+   "25b0ae358174cf0022cab955bc1a11ed619f2c40",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.keep-origin.http.html": [
-   "817abb90d8adf90c05214a9df4745f31017ff8cb",
+   "84146616d1900ed302b8056be3c2328ec43de99b",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.no-redirect.http.html": [
-   "7d769f3d141dbc29c3ef6119a1cbe3466441f767",
+   "d7cc5636c64650ab6bd0f1082720271d4505255d",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.swap-origin.http.html": [
-   "2ba0de6dfe253f98fe58fa3e3e600ba8367eb0a4",
+   "7ad57b6b4fee912bdd04071002c617f6ef47ce4d",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.keep-origin.http.html": [
-   "eda665dd94624cb33723fa01bbbfbb4afd575519",
+   "fcaec9cdd638829764d3a9466d85fd2b38aa1839",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.no-redirect.http.html": [
-   "445aa4dc852b2cb80e28a0b8ae4eac1910d7aad5",
+   "3cc2cedf87cdc0dda6edad556b17b8c406a7aadb",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.swap-origin.http.html": [
-   "455c57ddc2f5cb336fb8d7b58d3003c5b9004aca",
+   "9894edc7701aae2cd52abacc2cbdab995ed6ca2f",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.keep-origin.http.html": [
-   "ecdf4bdcc2d057c304d16e633e44cea468504b2f",
+   "171dd12732c0734dbec8d29c4be8932d98e0bb95",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.no-redirect.http.html": [
-   "ad33e3c9e1c95f5d05e34a9a8e438118a010f27b",
+   "ed1b6c74dd03706531f3a815580e1c17a21a32ef",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.swap-origin.http.html": [
-   "11851635644a3da52eefda7c5283d8f03eb7cbe2",
+   "7cc3f5af651ba0ad8023f4ffded96fc51a87e43b",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.keep-origin.http.html": [
-   "34ab7265257e003ffd1a17babdd86a8830bd09c9",
+   "d33fbb45400f2ff7536e7843f7c8db9c865b8559",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.no-redirect.http.html": [
-   "7e54f3659199b78da219967d5019d3575fd9ae65",
+   "6b5a967560ce652d2a2be77b8f4a54028f0137f7",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.swap-origin.http.html": [
-   "f7d5dd5c3ed56ac4576ee6a6266e21f01265654e",
+   "b95304308f351a7a178430342e32e6063ffd67f3",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.keep-origin.http.html": [
-   "f98f0455aaac0d3a6be00de91ac788abefe54e16",
+   "bd64cb26715832ed3eb424df02b18c955cfb69da",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.no-redirect.http.html": [
-   "a9f08ff0780e0a25f26af0c3a83b78276c835df5",
+   "5eb920b2db81c5936fa29652bdac35c99570d617",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.swap-origin.http.html": [
-   "88c43cf7067ebfbea7b6d34ff69ff762dbca7499",
+   "f22781e81c84c1ab16d8c0e302e1b313f44e026c",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.keep-origin.http.html": [
-   "7336f7f4ca323caa06a4f76fa979d835187cbd8b",
+   "6135f65a5beeec6ca7f9944439ad97ef84f03d5d",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.no-redirect.http.html": [
-   "787b4a2ff3c1ae16b4cabb145004ecfd29b9c14e",
+   "dcfa5b02ddbac818a3b855806eb01db2ab7c448d",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.swap-origin.http.html": [
-   "4277eb4be02be6692a918b2c2a70cfa385c04570",
+   "e2d56eb61cfb920ab74b38392e82dd3ffd189147",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html": [
-   "e7526ed42b2e910d03202e1fbf87672715ed3ebb",
+   "8b1b2a43120f2562d0e20b1b70eb9bc9e5aa5add",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html": [
-   "ffd8de6743f528d6c3e6c05dc947acb319459196",
+   "f29fb4bba1c0e45c644d8376a29fff12161b6af8",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html": [
-   "845056de54d0a762871fc1f4d81b933c1c86953e",
+   "220f8abb26054bd033461684ad6ee1381bb28e57",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html": [
-   "0000efd20a8355996f1cead4b3e4ff3dfc576c2d",
+   "4d184fa1992cf45b45fa26a81721d03872b5f12f",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html": [
-   "b84d1d8760ffe046998e6299b75192969154a18d",
+   "8260e81eb422944f11c97024b8da1de25f3d468c",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html": [
-   "cb44bb09dad07cba9d712bab9d69ee3890432888",
+   "cb89e64d209c18a531c85c19c79473648d2faf4e",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html": [
-   "2ac5dc65c37f4ce66f34ee1755ae794cb531e0da",
+   "0a9f5674ba0842aabd79870585fdb24c37bc5675",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html": [
-   "eb22b5280bc3ba3545725c6671db1693276ae54c",
+   "e7a54248f5c4b4553bd4336dd92e5a2ba9ca401d",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html": [
-   "b986b32cb61ff77db9bb9079d58c1887db2353f5",
+   "94da78b15531a1b91d2eae0b37c580e31ebf3a77",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html": [
-   "59e06f468dc0a2e9d3325d32475f7bd42cde73f8",
+   "22397a90b1bce6a2d7f4f433be6ad01992dd26dc",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html": [
-   "d13cccd36372c647832ab61a8dc9c5b41ed90021",
+   "db0ad8b0b2100a9820c5a3c1c93901a4710817bb",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html": [
-   "c355707ad51e1678954af094fc48756794530e02",
+   "7d93d07ae5a368bc122216337cd8d829e4c9bd80",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html": [
-   "becbb554fffd3786fdb161361c93ed436de6d546",
+   "9d2819f6ee5e450c9cbf55b90115c193d4d5999a",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html": [
-   "584875a8ca4bc7ec02a6fb03563ef72a9aee8c41",
+   "635ddb24ea87a40b1007b58dd3b172716effb8fa",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html": [
-   "3a18143a18451ba593665b9eb99dc4b0672b91b7",
+   "cc3ed504053c0363bfb553c4f0541322d5a8cc05",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html": [
-   "2c9c5689460e1c50995a0d1632e5cab3955623e6",
+   "5c64af45705db5b7becf71bb7163bc7ba321e63a",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html": [
-   "21643724a492f6f599cf990000109db22fa15f2d",
+   "1ad788064a47ec5d4e74833d76c4b225c2afbeee",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html": [
-   "52b471e48c93c34d4c6effa38c2079e487f3f90f",
+   "b233a53e8b8f7be3f36a1d5a03b3b641c4362ef6",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html": [
-   "cfba1967b2d9523db3d70204cc2d34f449699dd0",
+   "2bcd1db97dc7d648169f77c61ca79a36251bfe1c",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html": [
-   "e94dfaa4e49a24e19794f78cbf9240c2cec4bb8e",
+   "91b6e99edbd0fd47dd611220bfd6766fec7332a1",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html": [
-   "89446bf752b16815ffa2fdf09460f0a55aecef06",
+   "8a24d43aa59f0e8456036a4e9dc5d0f01e1df032",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html": [
-   "1946d0a2f7ed5c668af82fa3d5c34864a83f496b",
+   "209978e39351a449c7f8b2537d80b847bcc9503a",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html": [
-   "a41f9c33fa707b7adebb9ad2d80cd6707061f63c",
+   "270af5b66cd903bd239d76900629828fdd6bc858",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html": [
-   "60fb6ad337707de33eda5d3a08e3747b6cdbe3d2",
+   "e99dd16221c3dc9389497946f0b5140e54b45010",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html": [
-   "bebc7b516800ae7faa832ed62c67165e38069335",
+   "599e7c1a9f54094b4a63196659cdea7922d865d8",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html": [
-   "ba8139583fd69afede49e74bed77d6ae9783d7e1",
+   "0accc8042d345da3e9c7f54ccb3ab185e623ee56",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html": [
-   "5aa87fe3ec785a8c2a04ac21c31fcc6e8f3c497c",
+   "48bdfc47c308f765d1d7ade129bd0c532443a855",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html": [
-   "6480f77d1ca0f213fa30af9fa8ceec33c170dbf4",
+   "98ba7cbc5f299878ee8231305b088a39a3955f5c",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html": [
-   "bc09370307c681b6fb103f357741eca97912cf6a",
+   "c179cb9daa87572fb4f9a0fb8bdc4c4ebcc4a2c6",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html": [
-   "1e408c3702f1bd8f6a232d32657124d0f5f51724",
+   "335eb306d1617969c4a6c83273f3745f906b7c53",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html": [
-   "3faca3ec745972d807013a9b14eac268e0fb0a64",
+   "e7992c5fa431aa21a8261391d31af3de99bfc4cd",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html": [
-   "8b91e88211ac9a978970078c0485107f8e371623",
+   "be259c735ea7649aea892b7e512eda3deb554d11",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html": [
-   "e3d695f03168f4bb5052b7d96d494ae57e8fbcbb",
+   "36794c291e68b3b753290cf0c991672d0e47bb25",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html": [
-   "415c63aaf320870fb1e8da8976874a5d19dc9e5e",
+   "5bc56aada0a84a56915c27a23abca2663157de8e",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html": [
-   "b175b501b3fb17528540d38cfbf52fd15bb09db3",
+   "a2456dae170b907f2804fb4df75e1acb6a8af2c0",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html": [
-   "980f9fe51956d087afd146462bf2a4a015bc04c4",
+   "2bcad4b870d479a88c6bf39991d1c0880253860a",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html": [
-   "c1fc591386b327a7fce513739496fd394d30e1cb",
+   "598bfaae10cd4b900a7dfa5920e2311a314f8243",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html": [
-   "a3eade8bacebdc1ebcd4096869d0722a428e8faa",
+   "7714855f343142f34479d1cbf702ae057507d221",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html": [
-   "5368c70113c4e30a0968d4a8d93963eb98cefa4c",
+   "01d76e15dfb1dc934cbfac5e992607baa0d4a00f",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html": [
-   "4e41cc2b99e081405737f541edb0201a9039b5e8",
+   "b9390a5c5995697c41feb7a20d8f75d70a104f82",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin/a-tag/cross-http.no-redirect.http.html": [
-   "6a499acc7c1bdd7307d58b6f658762816b2f39bb",
+   "9d9b1bdf662c71b77e30e8c84c7184345203d520",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin/a-tag/cross-https.no-redirect.http.html": [
-   "e2a69816bb7c96d4ae82aca719c96480787db05a",
+   "f162894e7960e2dc86f2688c5bd9926d865f855a",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin/a-tag/same-http.no-redirect.http.html": [
-   "83b4dec24cd2d7343fa39c15162a6f4083efad66",
+   "0b313b05257c1823471b0f474a3816dee551730d",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin/a-tag/same-https.no-redirect.http.html": [
-   "03f7ee3ea9a7cb59284f99a02f44af486123f876",
+   "0128704e514094d2c5456020187b42f026ec6c4d",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.keep-origin.http.html": [
-   "7e1d06ba4cb453f7c97e3fac4b1e2fe4474aba58",
+   "00761ad73cba6621c6b2b398777c76997cd650b3",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.no-redirect.http.html": [
-   "ebcf709852448194d23de67b5ad3ebc6851c306f",
+   "f1cae87b0a2bf8a699ba02a88e58c438b5188716",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.swap-origin.http.html": [
-   "a7c55c2bb8ad54e55904244a77da3d0ad54c17cc",
+   "62ae86ebbba741aac450ef2a2b9b952cd6f5945a",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.keep-origin.http.html": [
-   "9715246e6b99dd8ef7902082275f217500bb35f4",
+   "c93a1b1792570bdddfa5007ca256594859ffbb93",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.no-redirect.http.html": [
-   "53565249109dbac64fa420c517d8b93a33a8722d",
+   "3fd1d70d8409fa4b604d5d4f686be9bf79873e8a",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.swap-origin.http.html": [
-   "a8d20be3e5261a1dacc6edb0bcbbd9bda13bf211",
+   "abe9474d69a9d0e044044c08ddaef5b4eedefc5a",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin/iframe-tag/same-http.keep-origin.http.html": [
-   "67087b4a2f7bce5cbbfef87b7176ffa9c49235ca",
+   "5d7d67b05b1321489b6cd19e08cd0061651b7128",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin/iframe-tag/same-http.no-redirect.http.html": [
-   "26f80cdb3f9fb9098ed8b32a88cf29793b1c34a5",
+   "319a779d9f25ee842877c4ff7d36b58eb5d0bf4f",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin/iframe-tag/same-http.swap-origin.http.html": [
-   "1cd4e595610d06c7fb19fcd5bd9f43509908d03b",
+   "e13bef6dd3af4c48f88746ff554a204e8b2b2151",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin/iframe-tag/same-https.keep-origin.http.html": [
-   "354e69c6e2f91a4f744c167d8129c112220a7a7b",
+   "63adf811f6ef3fd45d331582109ed441a30533e4",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin/iframe-tag/same-https.no-redirect.http.html": [
-   "6306053db2219d899b8ede170233b7b02735582a",
+   "75586b60e722025bf3ce960594facaef6fa12c54",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin/iframe-tag/same-https.swap-origin.http.html": [
-   "3aafb5ab78cd1d86626acf4b08b8607e85dc5755",
+   "712f03f877e9c65f114b1627c053c3e914479634",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin/img-tag/cross-http.keep-origin.http.html": [
-   "3067e3d6573d3a526c837c782389720935cbd887",
+   "8ce106cef9fd9609dc3190bf0ac2ccec016efe8a",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin/img-tag/cross-http.no-redirect.http.html": [
-   "15776d7aabcdd9fea9383555af193f80d1bfaac8",
+   "5675244ed7d1f5532bda6d8a0601d60211a760aa",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin/img-tag/cross-http.swap-origin.http.html": [
-   "c4876ce475f260d94a21e958854b41f74666a187",
+   "931513b3050f523a76b12a77c8f76f8ce423e0d9",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin/img-tag/cross-https.keep-origin.http.html": [
-   "916e625b5af96f14673c8c0cd7d1662f95d42689",
+   "5e4f20c5685c5fae25ad39cdf29fdbcdad202471",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin/img-tag/cross-https.no-redirect.http.html": [
-   "22a136b8ff276e7c69e1a18c56ab82db8a1251c8",
+   "0083ce1dbe7b10b2b0c48215d3a02f9f45736c1a",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin/img-tag/cross-https.swap-origin.http.html": [
-   "795ea3142752d25314cde116ad5eff32d5860fbd",
+   "122d9db4e3fc51580c6cb26b8686697a3caba7de",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin/img-tag/same-http.keep-origin.http.html": [
-   "aa74072ca00daa35516ac81e4fcc8df4f2a8c67a",
+   "2b1ad4e980928bedbb15c2d223380eb52d5daa03",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin/img-tag/same-http.no-redirect.http.html": [
-   "32ae9474d96ead56346dcb9996f395932fd46c86",
+   "7380faa3f19a7351fd551c0da0971bf0ba2815b2",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin/img-tag/same-http.swap-origin.http.html": [
-   "4938c5f49bb6f2c64b85b980f6308f8943fdd9bf",
+   "d2bec8fdb4a6a93760137ddd647e474f1b8615dd",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin/img-tag/same-https.keep-origin.http.html": [
-   "b298ce7b893ff9bff63a3b8c3c31a73c815cf84b",
+   "d6a5bbab61dc586fb33b0f27d4f184ba7223f217",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin/img-tag/same-https.no-redirect.http.html": [
-   "4a768077cf4b902ee630e67a4e3a1d119b854924",
+   "ab218846c11f7e0a510158e03df6f1f66fba4c03",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin/img-tag/same-https.swap-origin.http.html": [
-   "7fa0b3d1a0eecdf5f895a5d5bcc3641bcd6e2646",
+   "b54fd752874e99131e04d968fad53a331dd9ead8",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin/script-tag/cross-http.keep-origin.http.html": [
-   "8ede2b4197f67d54c637b7adea14eab073496417",
+   "2cbb8d5fa9f1096705fef75b9f57decc34d06a8c",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin/script-tag/cross-http.no-redirect.http.html": [
-   "c3a7d773bc334cb9113c00bde693997693fd34ef",
+   "26876438a6f4737fc9a02c9e38b6b2980eca768e",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin/script-tag/cross-http.swap-origin.http.html": [
-   "d6417c69efd5eb59a47cfafa3c82ab066ca9e863",
+   "430d1d6a946a3dfe1e657c40cf94f93c5adafd2b",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin/script-tag/cross-https.keep-origin.http.html": [
-   "26f266bdd3f7a8efde096bf6ed57009448274d7e",
+   "3378092acc9ad363b0ef4828204a1abfe59783d1",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin/script-tag/cross-https.no-redirect.http.html": [
-   "736342479f3e3127fa833ad003f00f958e67ecae",
+   "be20f467dc5df32e0bf66330974a4b953eb037e2",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin/script-tag/cross-https.swap-origin.http.html": [
-   "9f713c5013622d8aab5ef59e0086e550f41c47b1",
+   "bc0087c13149dd1bb7b57285147270a4d40ea0a1",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin/script-tag/same-http.keep-origin.http.html": [
-   "6e3d7246ab857705d8f7afa666f2d5d61a204e6c",
+   "8ad0755180b4e3a9898cf5ed65b12a7b91d47cdd",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin/script-tag/same-http.no-redirect.http.html": [
-   "04ba8e7d4af25272b3eed76f5be1d627d3dbeb8f",
+   "eef9696f9eb253fc1a276fd0e569efee5b90ebbe",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin/script-tag/same-http.swap-origin.http.html": [
-   "328bbc01bbc2515fc5d77515d4fda6b36a9d9c65",
+   "54f0164bee48f928f442bb71d42dab2cc1f96383",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin/script-tag/same-https.keep-origin.http.html": [
-   "a87ad9b9b21b8a548dc02a6c7c0eace401bb69a2",
+   "3c64bb16efb13c1464c92ce1b9ad16717192fb4e",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin/script-tag/same-https.no-redirect.http.html": [
-   "c7c88ff222f3309f656d880fa210420b1c0a8889",
+   "15f5ac3dbf98396f37479ba0507bb6469d79bad3",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/origin/script-tag/same-https.swap-origin.http.html": [
-   "80cd677c0dbf88893d403bcd124ecbbb33da9996",
+   "f6086fdf270aacd28d4e08d6a69945e444501fef",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/same-origin/a-tag/cross-http.no-redirect.http.html": [
-   "c132af5e9e9ed19a2470c8b4ef3ea22eafa698d8",
+   "3e5532b52f25c056f399aa0a5c7f84573bd63a03",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/same-origin/a-tag/cross-https.no-redirect.http.html": [
-   "b00a34e07ecbfc696565408564e987e0d1b879be",
+   "573cde548bbdfb9afb6418df2e3f8f2e8ae11dd0",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/same-origin/a-tag/same-http.no-redirect.http.html": [
-   "0daede6e6551c9a1bbce0b592a5384d012e70282",
+   "cd85233e2aa1e759ad856c8ccbba7a724d8e7c29",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.keep-origin.http.html": [
-   "e498846d95b2c2948f6b46286d738cafd610e0a0",
+   "fed49b9929820e80606e50cc8de8df025a660972",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.no-redirect.http.html": [
-   "90d39202d501b723f77d67efb916062f7023e93a",
+   "3ef48104652971e60358b1ce1a02e70254d334c0",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.swap-origin.http.html": [
-   "596d3da28dd189e56612e00352b9d97e817b7be2",
+   "8e73234772df5d7f29431d9f226ffaffbb49e31d",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.keep-origin.http.html": [
-   "45ff588abb3bb71abe87a930592840a8da334654",
+   "8aef178125c51a4b897617f5df30084446e07e5c",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.no-redirect.http.html": [
-   "bb6f769acbf591d465959354ebb3d4e94f141f88",
+   "b44ea31883123c8d256c414f53cd73cee2a47a17",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.swap-origin.http.html": [
-   "a825c3bc179de8915ab9af18db9061b5776cbd4b",
+   "53e57b9f1cd9d18bc36bb29df2c63758bc08d3ce",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.keep-origin.http.html": [
-   "b4d54468708d7dab3d6ba311b9bb78b4f5a81ce9",
+   "03022ade244d8f6e44ff628917069def65791535",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.no-redirect.http.html": [
-   "ddf2d81f900d7cdb025920b35cdc9906f1abc9c2",
+   "4d52accfa4191263a6a0915a1d0db44155536ace",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.swap-origin.http.html": [
-   "10e3141377364ccd0c1b68f9041bde06802ad6c4",
+   "5c13d6d9929caad7db578f5d6b6e1cd0ea24cf39",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/same-origin/iframe-tag/same-https.swap-origin.http.html": [
-   "7f82d17b46bfa212e546a8eb5abc9dad62b27f2f",
+   "a9022228931a6c27169c0fa2ec92d63081ef7b14",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.keep-origin.http.html": [
-   "ac8d2f6cf3a2d9b92cd04786cde04aabd173a0ac",
+   "937365ce55901d4d7154a12713b23475ddbe7db3",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.no-redirect.http.html": [
-   "ccaeff2096aa171962126d59cadbaeeacda04ecd",
+   "dfb394b72d81c8f818d2f86818d7e8fd0f2c468c",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.swap-origin.http.html": [
-   "e831f577b6e9bba754a1f9947de3e52abf2805b6",
+   "c526d6bfe4a22f535fe5fb5e8fdbc28101b26b14",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.keep-origin.http.html": [
-   "a8f6e1fffb5195b86a5963cfe4d9cecafde6757e",
+   "57610c1eb7878fee89aa0aa8c7e2913679f3bfa0",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.no-redirect.http.html": [
-   "e46908ace43d31d59efef4bcd707e820f8b10c16",
+   "fe450105df6631db82ddd97313d7acf941c69f01",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.swap-origin.http.html": [
-   "9f818b1e1a8f3101867f89364d1fbd1439c9943e",
+   "15cbf00cd1e8bbcdd6e1f2403ec36a72195c6818",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/same-origin/img-tag/same-http.keep-origin.http.html": [
-   "6b953dff155c9c201b757a695839790e9bd69bf1",
+   "7b9cf7816a24e6f70363ff59d07e51a54570907e",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/same-origin/img-tag/same-http.no-redirect.http.html": [
-   "e452225b58b22a4745afb07b84ffaa1252ca3cd0",
+   "def3201c00cc4d3d20d7b31ee0f83ddbde2450ad",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/same-origin/img-tag/same-http.swap-origin.http.html": [
-   "43736c1cc4895133c43a6271a7bc74ccdc4c133f",
+   "d989feecc88e88e59b9ed52fdf667819da165d3b",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/same-origin/img-tag/same-https.swap-origin.http.html": [
-   "a786c73b0a6940852d7b400edc0bb4db60beca77",
+   "c2f6fd8358e83a2f482be72eb886bcac773f8602",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.keep-origin.http.html": [
-   "ee30862a973376a98e8a059ba313c826065dfdbe",
+   "068e98a40bbfc19665916366ff4dbb0c097e98cb",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.no-redirect.http.html": [
-   "aea1e262c60eaad0146b51e9cf58a137dd3286c4",
+   "e3b6aaafa7e159ad6cb6896303d4e64f664204e2",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.swap-origin.http.html": [
-   "fd2c8b97ce1a95a369ce443a90eb6cea32a4f52d",
+   "e2cd2fb68461a2ffb802c13aa20aaad4850b7254",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.keep-origin.http.html": [
-   "2a3a5ca9897d77d19c090aca69e7021fbf5c4e60",
+   "2df9945825acddda79547c4e51f5ac265587a06d",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.no-redirect.http.html": [
-   "3c7dc4e66aa38e72ac10981d33d37b1f6feb200f",
+   "33d92f252124a72a11af88709b5ede66498f49c7",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.swap-origin.http.html": [
-   "6048d78bdb3c2fcb57917021a3682bd85c2230dd",
+   "9f33d1c4d5da7df7895053f892f3baaa767e6cfd",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/same-origin/script-tag/same-http.keep-origin.http.html": [
-   "1bf3ab30f6b7d9da0a6203c461ef04b7220362a6",
+   "030faa9691d8a5088cc408d052d2d7e95626985f",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/same-origin/script-tag/same-http.no-redirect.http.html": [
-   "31e1c71a682e79763c1c42f740f73739d0fd1cc9",
+   "57ce65ba5abc7069470e49a20cff3a673503dc51",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/same-origin/script-tag/same-http.swap-origin.http.html": [
-   "15d8229a683bd0b55b614ecf2dd11325793ac72e",
+   "cd28b806852c1eaa6c94f6e51b949f7ae3b25fc5",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/same-origin/script-tag/same-https.swap-origin.http.html": [
-   "bf6268411a9e1647451ee123c79ac4b7d581f747",
+   "696ede16efd8a285fcb2e61e886e997bc23067b5",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html": [
-   "aea84a0db2e486fab48537dd2b61a07be04e6bad",
+   "325ce556409d6c34b25f60e7d555fe999e63e2c3",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html": [
-   "0994a345db03ea311815ce39ad209c2d5247f280",
+   "c196fb02e2a2306e1d8e14dd06431463086b1c76",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html": [
-   "bb0dc705be8e8871840986700084536d66924b5e",
+   "5b650463733c734e7cf96530f93836eba0f6687e",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html": [
-   "d899449ff739528211197914087adadcd46d85ed",
+   "cb23c09dc4b22407d3421f21814a1ca108be4c69",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html": [
-   "b66b1b01428a032b1628326e0c10412f4a84a7cd",
+   "b2694ba3bced16d7e112f2d54fade5ac94f89d9e",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html": [
-   "ec985b1804e23ead7899c040d9950dd38a657b26",
+   "6248afd88ed5b47a16b1fc0da535d6b8b79afc43",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html": [
-   "e597c1dec0734dc3eceeeeea24e3693e960ca2f4",
+   "5b04e9f7db3e2efa8cb1711b40d7ba3c02eee49a",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html": [
-   "e932d3cd3f1aa68a74ccea0f41fb8372f5057fb0",
+   "9cb21a406d10194e81e49155badd4518e4709256",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html": [
-   "83f05ada593fd486fef5b485c295a504b78376af",
+   "ba995602ca6aa8c2153a325f26a969998c45e4b2",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html": [
-   "23c8ba77856c24e0a28ab3cfcf8d6cfdf237178b",
+   "7538d3b323a0c7706ae2bf26a71c8dfc588f4a8a",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html": [
-   "d63e2f8ab0939d103afa68eeba948d0e725141f6",
+   "e8b1a64dd60a55f47c6f9c009f13f64d2d34891a",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html": [
-   "6e266233bb1ae228b7ba134e206d16357a6fddd0",
+   "7da4311182f666bd905a4aa266373a5d6fb96da0",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html": [
-   "c4ae13388b91d16296cc846ba344fd5767accba6",
+   "4d2d67e9e9d194271bd72eb3a5beb208f04a3943",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html": [
-   "5cf1e2fe3e186888d5d7980c31b31eab3802942b",
+   "9cbeb0b6cad5ba8169c7b9313484c512963e46ff",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html": [
-   "0ac920f1482c2016fcf68e507c6f14b5824a7cb7",
+   "7e49773117b07619c51a266a6b8f25264eae52a8",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html": [
-   "f6dd7e9f0b352543120828afa70af73373acc0f0",
+   "294e449e55b16084f9012b3a4de8046fd52c61e5",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html": [
-   "a69f7cb4a23c0af49cb9fa77dbbd98e50f743572",
+   "e4f989d7af465002a22af28feae5f086ef04a473",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html": [
-   "35d1a5c941a70d258724a4c17a0ac1ca55912e95",
+   "c6070e687952c2fc206c35ee4660da4417a9afc6",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html": [
-   "b4dd950391bc965e49a8d91f3aae3dd86f76e2be",
+   "e65abe567020a8e6111e77265be04082017f5083",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html": [
-   "1872f9e76cf4fd580b77acd51e6f99149d9fe30e",
+   "492cfa1dd3a5ee0a3e27a5891cb6ae5978036477",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html": [
-   "f27cb2dc197ada1d0a1832c580e559dd72982a8f",
+   "99342cd5f2d2d4ba20be7b9725866bf208a3e7be",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html": [
-   "cf687c5d3f92a1c7d6f23bfda8be252b799c7c73",
+   "5ef973da8458a75097b6c1d6c1ebf81383d93b91",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html": [
-   "9e01d7b1bb8b5299d6f65b55c21c958636c41f60",
+   "50542680131693b6536eea5513646727b8900937",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html": [
-   "06ce423ad62720cf44bcebc40ec9560f10fe17d7",
+   "888f6b035ebd0f152464cbf2c47375362a4d8327",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html": [
-   "e7a6839a0962dfc14cf3f50cc874d777ff5f8aa7",
+   "ee84fa635ac8f08139c4d89928990ef7c6508f18",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html": [
-   "eac87cd5179fe0814109c63af49e8e511837d7d1",
+   "d9d2f5fc9653d03176107eaea1e576502a88c21d",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html": [
-   "f03eef841837854f638b51b6cb4b2903601d676a",
+   "7c297e28c32f7ee7758486e23abe93bdd3d24c17",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html": [
-   "15714477f8e7220410239c8c35f1125dcd3d7c2f",
+   "49c6b5717d739e48a9323bba91c3ee76523c39f8",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html": [
-   "bc00f9f80931d102436218757138b5379456564d",
+   "a8fb6ef5148faa8302ed0749fd200c32405260d0",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html": [
-   "eab14c17716019e92199b27a9adbae7039f147be",
+   "b19373043b8232508eba33af99cfae616bc5b3e6",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html": [
-   "6a100c67e704689a4f2163a7eb5b00d755aebba0",
+   "161b2d594841d660430a97dbe1357b74b2c41d2a",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html": [
-   "c02c82a7d2d7f4e574ae94b73737f4bfc96ffa83",
+   "9e7fa6a432c9495e1dc3a6afea8ec03182e759d4",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html": [
-   "c9886904738373a8bc4a7bd016bedd30f33ab113",
+   "8ca02232be2989244974aa5add3cb5bea3978543",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html": [
-   "3f8a555d7ee9e6eb977f28b4884d91cd56e3036a",
+   "88382eb0f81f207579ba1014eb496d2c74480cf4",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html": [
-   "f722ac89a7d8e6fc191418bc3295e70b9e8054b8",
+   "0be2f856b9d62981a38a81bff467a6e97a1d5444",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html": [
-   "b73d5f4f297d2f3549121bb18efeb68d7af21ae6",
+   "adf5eaf5ea894d631650d50becf3d7d32ab82d8b",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html": [
-   "116775c576ee1738b2fb8de2801218fc1f1e414a",
+   "c387986f3c3fe0fbaa62ed92d24b19e3ce2145f5",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html": [
-   "e239c323e67f8baf97e156173db9d0e74283d9ee",
+   "f2e617ce5a99c50a9fbd4de06ecd6274b9d4a061",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html": [
-   "0562e65dbd95b75a28bdd7840b77ae39741c829b",
+   "4c997eb2c86d049ac3a2ca84b038d69aad5c2131",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html": [
-   "8b4e58faeb1ca1f388b542f777736ef60fb0d8ae",
+   "78295c33fe6a9c09168f066844e66a0c45162dcc",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin/a-tag/cross-http.no-redirect.http.html": [
-   "8b976a674f2735fcf52f176af988d92f89ce59fc",
+   "bd605239a47973462f9db3dee02f1e0aef3a0d16",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin/a-tag/cross-https.no-redirect.http.html": [
-   "5673e9b451c47a494f892116e12937b718d57f12",
+   "1752200d26aeb6eeda4a7f2de3ac851c647b90b6",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin/a-tag/same-http.no-redirect.http.html": [
-   "735f518ac55ddbc74e5a8cbd2c9c3c6326515d7c",
+   "6dd3cdfe87f598367fa9dbfefccf09a017da6a85",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin/a-tag/same-https.no-redirect.http.html": [
-   "cef1d596319e765532fcb7950ecc9b52ff59cedb",
+   "622ec8dd2d33b6eca0104bf6f6f4f86e2d9a7ea3",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.keep-origin.http.html": [
-   "be5d9d7d80f00b6220170186c3c9d3c3f283caad",
+   "8c34508b4c58396dcfd2f6e3952dd90013a6cb1f",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.no-redirect.http.html": [
-   "2902ab2ed4296ff4b609af98f94131b3e1e98916",
+   "bae4e2639002ac92343d856029bc6553fbdef66a",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.swap-origin.http.html": [
-   "6beef10200848a37c3386c82bef364d5fa39b715",
+   "5baa0abc9ad2753512b225b055d1ac1bad01dbf3",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.keep-origin.http.html": [
-   "2d1a59457ef50cd4b5bc522c52d972553b6e8f92",
+   "78a9ed73b86c2ead95ca68ff2ce6c1f1dd245d2a",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.no-redirect.http.html": [
-   "4c024eaa5c39b3692e9f9c8354a019cad0245201",
+   "02f50c15c9ff935035fef9a125ac92283bc0e63f",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.swap-origin.http.html": [
-   "a1b105c0f765357f56fdf2a096b95969bfbd09b9",
+   "da8f02835e74aae20a787358be1e968a78fb837d",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.keep-origin.http.html": [
-   "482e55d4eceb34a33d6b74bf076ffef7100c9898",
+   "8706697dec7c8bd1ee9be951ece2197758ac65ef",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.no-redirect.http.html": [
-   "25a79af681938bef99fd0b28b80a8db85772da74",
+   "389acd12fbf1ea1b4fdfd3a653040ba3be301c9f",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.swap-origin.http.html": [
-   "ddc5e1120d6baca650bc7f92b6c4cd686ad0b3d4",
+   "477c7e0e7c97fb2c67811bfd7848b57df1d364ac",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.keep-origin.http.html": [
-   "57d41772cf993f2208d380cd0941a2a6458c39e0",
+   "a11c209f17776901f3b06831e0da4e63ecadd404",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.no-redirect.http.html": [
-   "d1921eb211c479d07824436d9d02b9319e2c9d51",
+   "7007de57a613254052f0fbc19034ccafc9763e22",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.swap-origin.http.html": [
-   "f40f2eaf6732eb44e063817ae0c7e52d3f30e690",
+   "b0a5a73e37182709f72b41e2810138ee1ca8cd5c",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.keep-origin.http.html": [
-   "9e6ab78b9bcd785f93434098d9e9fdc55bd1c924",
+   "f2af0cdd2392acd3e023e4a4b40f1d30b4198e9b",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.no-redirect.http.html": [
-   "a0812e5b0444c7318043e88bd1187fb085e5a126",
+   "7ebadca3993a063f464291b07293d66f70b402bf",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.swap-origin.http.html": [
-   "f68375a2c182dc9607d43f0e93eabe267946aa94",
+   "c944ba31a082719c49f9de2ab6c910c79dff7d32",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.keep-origin.http.html": [
-   "0aa611098f9909b9b500e05753cbaac55b4b8de9",
+   "9e7d44161684d43c183ff9b828d829ead5aa1c3d",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.no-redirect.http.html": [
-   "699c949d1c2adc40ece9449a1612661541aae15c",
+   "4c98969ce1b22ce6393266911f52ad30602a92db",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.swap-origin.http.html": [
-   "edcb7e6fc8b40022cdbb3d605dcb01996e792f5f",
+   "c7bdb8fca036cdb8114470105071d6b4847f648a",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.keep-origin.http.html": [
-   "280d9773dc92f73d099407cc1425488d2ca8ed63",
+   "2064a1139275749a43ec8176de230de7dacdfe7e",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.no-redirect.http.html": [
-   "d79049c2dc47ecf546a37805bbd49ffa6787e9bd",
+   "46615b08847afdd84518b200f276df332223897f",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.swap-origin.http.html": [
-   "b1287ef39fa34d0fa9eeaf41ec81bb79dc481ad0",
+   "b575c0f76f9ce46298cc5a4e9080bc44c6351433",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.keep-origin.http.html": [
-   "f98975f3ddf738f3f45095c8533c8b0af9c3520e",
+   "4bfef3725c06617b1e666717ff6e69501436c1ef",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.no-redirect.http.html": [
-   "85afeed9ebadcee57b08693cc5cd1abb67886a49",
+   "0aabad4311a9dc956359133889c9254719619678",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.swap-origin.http.html": [
-   "15f1638f9707ef58fd73b6c298cca228b4aa6201",
+   "edb3036eff87838aa900abc553717b1a1bd7cd0d",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.keep-origin.http.html": [
-   "f95dec72e052bf5fa851bbeaf1c1b78deed5e095",
+   "826028837a1e17cbd00896ee90846111ef19cc9d",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.no-redirect.http.html": [
-   "67bc6a27f0815a9fd1e501809cf6ba5f5ea49a66",
+   "944014e95527cc029a42014a3f763067530b69d3",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.swap-origin.http.html": [
-   "747ee1a2a87e6a5d67d596d6666e0851c5545a5e",
+   "2c5dc87afc21338c80a28ea88ea90eee230bc941",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.keep-origin.http.html": [
-   "31911f764e0f7e4703018224a8f3f669a4f79818",
+   "0d2d6e2c5bcd8844e3f3da5f30fb1c1124be7c7e",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.no-redirect.http.html": [
-   "ea5cf7313f3e04aa4dddaa00dad80321fb94241a",
+   "7b29aa477beef30ab2afc65395135b716442cfd7",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.swap-origin.http.html": [
-   "efbf5f7fbab1ac685053c9ae5ca59539725cd3f7",
+   "0dab8adc77755fbca889e75ec651df8c5f7e2f13",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.keep-origin.http.html": [
-   "91a80a43818630d2de6f012b0a9a0be3acce126d",
+   "4b87d5ce52cfb25295f8b01c8c2eaa3e9c4e5a84",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.no-redirect.http.html": [
-   "99b1133e510eeb9a4c4974c3cc1d14eb4a69f3ff",
+   "2accd88f028fcb3e1ef2014aa98f7b3bf1f2acd0",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.swap-origin.http.html": [
-   "ebcce3142973307c6448e21783dc2f0fce56b954",
+   "1ddbaac9928a04cb162c18ef42f43b599872047f",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.keep-origin.http.html": [
-   "dc1687f9660f9594697ebe083161c5396f34e657",
+   "d1f6dc24c6503ab8ba9f032d57b4539ca0c189a3",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.no-redirect.http.html": [
-   "51b104eb43409c210047f174aeed5def5f0dce52",
+   "727c7352ab0bb198082a34379269b430d7b535cf",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.swap-origin.http.html": [
-   "8f4e1a60fa01c2b67f1974c63c56997d12fdde04",
+   "da7cf0d38f680511c14dd3f2f1e898d88ad023c1",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/unsafe-url/a-tag/cross-http.no-redirect.http.html": [
-   "30dc74a8394c05b306f7024baf7b680caa711ac0",
+   "fd9dd2cee91e5737b6ddc4b2761d6aacfca3a870",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/unsafe-url/a-tag/cross-https.no-redirect.http.html": [
-   "7440fb41e24cfd29b309993be49ae78143ee7814",
+   "88ce8ceed909ddedc47e0ea68edcab33d5de4aaa",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/unsafe-url/a-tag/same-http.no-redirect.http.html": [
-   "c6ecdd72b9404a265d568031a1bfa62fef8c3205",
+   "b1cef3313931255f029f1fd1244d4b80c286b65c",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/unsafe-url/a-tag/same-https.no-redirect.http.html": [
-   "83bf18cc55faa01908ab171b29a812faafb280d4",
+   "637521db6e9b3d703f06de96d3139f5c38cfe204",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.keep-origin.http.html": [
-   "6a0e12fbfea5f8f10c9f6f1bc8ef3e4c443d2328",
+   "24e85ddcdcf3f91d96df762ee0da6b35396e8b3e",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.no-redirect.http.html": [
-   "927d42549dc4264d3b092d44bcb8b8a11de7dc0b",
+   "75376cf614648f14058f8d730fe4c64e4eb2a22f",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.swap-origin.http.html": [
-   "04b8b648f8a0098792f3de9f3420045a36bc7002",
+   "75fb99ce09fbf229f0d6375700f421441c571ee9",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.keep-origin.http.html": [
-   "5991dea7169017a087a1f6a71054249f07789882",
+   "f7138b9755899ea69030c2e2290ec1d22fb1e8c2",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.no-redirect.http.html": [
-   "08b98abf5f377d6b88b746acfd7a7a9f42208f98",
+   "d5a25909c073bb4f35e36be73cf1a12915f4b623",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.swap-origin.http.html": [
-   "f55dbf24c216f3f82a25cffe59c0a4feec85f858",
+   "2229e59ec07d21cad4f185d4b3358b116b0f32d4",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.keep-origin.http.html": [
-   "a072402183ab5f98d5458921a20313c47fde092f",
+   "5db085795a442bd65153e054eef8a318b4075cec",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.no-redirect.http.html": [
-   "183cdcc2bd6e32d4c147e1c1afc2c70d702ec7be",
+   "44351d534fc14beed3fd84a162994f475d96458e",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.swap-origin.http.html": [
-   "1cdacdbcb474aa3d51a7281635218adc0db0560a",
+   "913cb289a28dd6ab0b1e7ce22257a9beea71363c",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.keep-origin.http.html": [
-   "2b936140ca23696ff0b3393e9eefe73708fb1600",
+   "76ad177546b38527f22f5fb52e1c8ddc80349f7a",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.no-redirect.http.html": [
-   "2b86b1abafabbbff4f7f6f95cad8590d5be74aaf",
+   "8e43576efc988218c2f236f9d7994292cfe39d1f",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.swap-origin.http.html": [
-   "c20095f114c38a4a4bc7b1dc079826806b082cdd",
+   "a1b580de8fb901d2cd0b0726806c93bcf4bbc4ca",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.keep-origin.http.html": [
-   "ef9c8061684b4c04dd99c1650aca5260eb4a175a",
+   "b33395f373225e5a164724275491cc1fb50829fb",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.no-redirect.http.html": [
-   "66c1237f80784c9e8a410eee845f5db50c301c63",
+   "c70df3e35b7e46e39701b9ab1378bc51d492ae41",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.swap-origin.http.html": [
-   "82264806897c7b47844b3548b887c04351edc25e",
+   "2f7ed240400bee1ad1de21c44dff9a8c229cd2c8",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.keep-origin.http.html": [
-   "bcd8e106913e7163dff21467c3988490cfad8e9d",
+   "d7ead3adb0755eeb31a68baa7320290c81c79feb",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.no-redirect.http.html": [
-   "d31c60c253bab68b1020dd7b0e66d8a7b4a1c45f",
+   "1e49b665814fee6cb264cd130b8b6dbe800856ed",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.swap-origin.http.html": [
-   "53593ca4db1b0304745ba2a1bea196c4358fe837",
+   "30b7794bae3e77fe6dd2ff5165f2affeb6c7007c",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.keep-origin.http.html": [
-   "55d4f02cc4ff63d8272bb9834946f778449125fa",
+   "768d6ae83df944176de15f840f88f1c7cd0151cb",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.no-redirect.http.html": [
-   "970f734cc72b43b5effd42fbf27991af4febc2c2",
+   "6675a82864e99bb31fcc766c7a608126de52dc22",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.swap-origin.http.html": [
-   "402e089288db32b1ee8ba272112c0e1cb1d459b1",
+   "85e5b3d4365f024632ad078767ebe64d2f66647b",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.keep-origin.http.html": [
-   "755b80e6743934a65e57593cdc623cb5bd796063",
+   "0245978ae2461b97a5f8113003971c92a6e87f12",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.no-redirect.http.html": [
-   "df3a93a736e203da7bd6721150024d865cec2d3c",
+   "4c6d9d947d8df1795473dc1afe98fa8d5e55417b",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.swap-origin.http.html": [
-   "4e1ba92a6604b0d3c050aa24472b4f89875c8601",
+   "d07f71df2072a620aa677ba20b4b6b2e5e17ed43",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.keep-origin.http.html": [
-   "1404cb50cf638c93118155162a071052a1ad2f63",
+   "d0e4ac8fa12b77c758c7e74299bcffc5ee0581c5",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.no-redirect.http.html": [
-   "7c3fe13e2615ac280dc602f64102c329423a212b",
+   "16636872c0207581c32c595014959af0aeed4bf5",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.swap-origin.http.html": [
-   "749e5963912f2691bbe8dd7d3efe599e35a6202c",
+   "e1ac5e29da6290cc62f9e4fc715eb14a936533bc",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.keep-origin.http.html": [
-   "83a82e30cc65ba677a182cbefe523535240a9f73",
+   "96f7eb9705d79b266c86c03e2f1a9f2113cbf953",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.no-redirect.http.html": [
-   "49b86fb31eecb2e6e4c3f644f100327ccc22346e",
+   "a923529a17e0bdc5515c694cabbc4a35af013e35",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.swap-origin.http.html": [
-   "6d04bf37d00e054a045aeefd0dc1ec3cc68bda3d",
+   "e27f8e54fba82bac0d1f49cb5fd317bc400d128c",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.keep-origin.http.html": [
-   "a0fb08ea0b98cf6e95d3fecf9e998c2b2ab8e7cd",
+   "ce44913a5ef2bd038b87429f8ee70e8471f2bd44",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.no-redirect.http.html": [
-   "10b61b10295b25a9d7a0fa195b7c8f877942a4f0",
+   "9c39758a01ae03d8de123e6cd9b328cb0a2801fb",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.swap-origin.http.html": [
-   "787f55ff2124b698dea27794003aacfb1d4e09e1",
+   "5d7cdfa8d5dbe045e0614dc6d927570b9e2affac",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.keep-origin.http.html": [
-   "6d379ea9c775a78f9cc2c1289d3e6da60bce1e46",
+   "333a9f0dfbaf0cac23ff4f95b02316bcf8004630",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.no-redirect.http.html": [
-   "20d6a05ecd8d5933dc4bbb7189114c567e6d1313",
+   "cad091685b3ecd0ea8c94460176b7c5789d4318a",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.swap-origin.http.html": [
-   "d14f4b465cf45f06b8fd6d3e2dd23b8872fead0d",
+   "d0dac9ebd247578782d61eef926a57ca741c1fc7",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html": [
-   "6fcc2e48410f1df1fdb31a692683b9dc88f8f123",
+   "ee374dbf768f63d0b76205871a2f51c0fdc6d858",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html.headers": [
@@ -691362,7 +691193,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html": [
-   "12e41301c9459f833b92c8573b303e9f310fe984",
+   "f07855ee68e9b6f895ad694f967cfecf9d417720",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html.headers": [
@@ -691370,7 +691201,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html": [
-   "e9da6d9e804b03671beaa9f4a115fcbd7772df5c",
+   "0bbd1f69006dfb920e6a3328dd2d4005c1e9ebcd",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html.headers": [
@@ -691378,7 +691209,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html": [
-   "ab80ee87cbd8ddf0db5aebfc16d31a51d20cfd24",
+   "a124514793870f18c93ab2d09a42032ed896ac3d",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html.headers": [
@@ -691386,7 +691217,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html": [
-   "fbde28cf9ce1a707d08cd35b6faf0c347e3c1d95",
+   "1ed2c9b55058f7fa2002196517f0e4d74c7d3701",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html.headers": [
@@ -691394,7 +691225,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html": [
-   "5acd29b81583d316bfb4fda889198fa2b1dca03d",
+   "c67304f7408cc36711abe4cbf2ab154b60cfe637",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html.headers": [
@@ -691402,7 +691233,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html": [
-   "bed037e0617cf5403daa215353e3d7d2a0638b76",
+   "3b1075f8a291f934a3267096d16ce1beb8988584",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html.headers": [
@@ -691410,7 +691241,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html": [
-   "d33cdb5c99b646a42761a46153a1cd851f486a33",
+   "7dbd2db9326b696dfdfc6a6d3d342770e73fc93f",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html.headers": [
@@ -691418,7 +691249,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html": [
-   "2d81ef0fd42bc06bcc153bd739b08ddee3a2493d",
+   "381020458cff130222c33da6da7d709e3a21a94d",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html.headers": [
@@ -691426,7 +691257,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html": [
-   "248935bd6f186d92be71c36b44a4fc49a962482f",
+   "d0e645740e6e9e1d3aab40b755babbd8cd49e2ac",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html.headers": [
@@ -691434,7 +691265,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html": [
-   "029653aa7a93df5955377db4b14e4039b8a0b264",
+   "e2a92885d699e284acf3b7b9f1173a516f9ce90e",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html.headers": [
@@ -691442,7 +691273,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html": [
-   "b316385e01769767297e71279087c0f1a37c1237",
+   "b6bea77b14be464fd7dbd434585eceddb2cb5254",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html.headers": [
@@ -691450,7 +691281,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html": [
-   "3dcdae2799d7f8b0d04483b2fdafada94a1ca304",
+   "a13393de325d16317259af29da298d544efe66da",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html.headers": [
@@ -691458,7 +691289,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html": [
-   "54e35080fef42129696d0744a0f5d78e7c3e77b8",
+   "2d98e36788bf4cb7399fccb5b19a3b3532415087",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html.headers": [
@@ -691466,7 +691297,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html": [
-   "a12aba37ee9fb0bfbe5fd3c540bf27a0f5c6f534",
+   "dbdcf2f993991dbbda8f24add1caa4ea270855ec",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html.headers": [
@@ -691474,7 +691305,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html": [
-   "75a3ffdc15ebccae634c937462a19f325c343ec1",
+   "4caf1ae86b53ad57536dd2999fae79a32c9be645",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html.headers": [
@@ -691482,7 +691313,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html": [
-   "6cc9885e30adab087d65aec377f41b2e19a9e645",
+   "2758b19eb7b05ebc5f8c96f7042b9916e530deff",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html.headers": [
@@ -691490,7 +691321,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html": [
-   "4a167e2691f168d679703570ce9b1b1e768f69af",
+   "cfcc2e04ba15653ddb495028f1109ef1844b49db",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html.headers": [
@@ -691498,7 +691329,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html": [
-   "5f3f07329ca1dfac78c72c20d2f843175a13daaf",
+   "88610a132c267d09a92da765c0b6a929ca65ea5f",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html.headers": [
@@ -691506,7 +691337,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html": [
-   "917e3df21a19e0600ef31087b4c383552ea6076d",
+   "7b6ddfe88fc81524ce1bce738fe72167b2eae529",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html.headers": [
@@ -691514,7 +691345,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html": [
-   "3aaa4bb2ebc7f78621f2959a31d905167987354c",
+   "72280322d99507cbb22f4555a84379497bcbad23",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html.headers": [
@@ -691522,7 +691353,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html": [
-   "4af2bcabd55d7d03e25f2e75d22e5df60649ae4b",
+   "965470028386e52b6dda246887f03136a63f31e5",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html.headers": [
@@ -691530,7 +691361,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html": [
-   "92ec80bf7b2082073aaba831016795f901ca6baf",
+   "281966fc330ae2fc18dd72f583d62818b8fa4fe2",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html.headers": [
@@ -691538,7 +691369,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html": [
-   "4004fe51decddd0fab935f106d4f28e517b9be1f",
+   "6ea37da5a2024c393a5e98558616cd9a0d8adab5",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html.headers": [
@@ -691546,7 +691377,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html": [
-   "5271514501f0353a4c3e94012994bbfa100a70d7",
+   "67073e8b4a8ff09cd186e73c350727b548ca6019",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.headers": [
@@ -691554,7 +691385,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html": [
-   "2e1d92a34ae88078bcdea9a827bfc9569779d83d",
+   "f5796dc7ec510b0a36e7d990d5925505988e56ec",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.headers": [
@@ -691562,7 +691393,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html": [
-   "ada402d0dfd40d06565140059baefe2a687a34b3",
+   "c7a33cd1af56feabe631576239b4ac4a2ecb7b93",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.headers": [
@@ -691570,7 +691401,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html": [
-   "fc8fe6678dd2b02af433df363263c798010cb394",
+   "14ca80dcbd6165ed91ea92b20c560e56bdeb2233",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.headers": [
@@ -691578,7 +691409,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html": [
-   "4fca6e923c59627883555ddeaa61412b410b2d13",
+   "6780c2af124e7c9ee46d4b3479c2412653a19af8",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.headers": [
@@ -691586,7 +691417,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html": [
-   "14fca890bd262719fe724b924bed2ba5fc9d1675",
+   "27da471a0767de0866fc7a3aa146d4d17de708ba",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.headers": [
@@ -691594,7 +691425,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html": [
-   "e265aade7ceca9a136d83bb6fc386ff81ed2c596",
+   "8f4f9d2156fbdd54009b53b2aac51f8c3c895a9b",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.headers": [
@@ -691602,7 +691433,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html": [
-   "0f91cfcee72c97b7d13d2ef14369bf0e46b7d7f1",
+   "c00ffbcfedb6f4d2af7eefed58e42b0e8205518d",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.headers": [
@@ -691610,7 +691441,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html": [
-   "ecd2cedd8089ee87515e823cf8c83c6e7686142c",
+   "9e6f4549c7c5418cfc04e591d7e5f3411d627c05",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.headers": [
@@ -691618,7 +691449,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html": [
-   "7f67bbb8af9b87b86875d32e7375abe9adae88e7",
+   "36d65e21affbfc532b1d0c39ddc23361043e2a74",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.headers": [
@@ -691626,7 +691457,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html": [
-   "0e5ad8a433f5affd3ceba5e2ce48e7e405f46bd1",
+   "81fb47c872de9a5f3326a83749280bdb849ca979",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.headers": [
@@ -691634,7 +691465,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html": [
-   "5f53a1ab6bda4a3048b0769fbee136ef697f7359",
+   "e8ea9b35ee0b98e425d2adb9ed63c1f735171349",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.headers": [
@@ -691642,7 +691473,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.keep-origin.http.html": [
-   "7bf766f7079b74b473ad43bcdcb8e2f3a9f28136",
+   "247a4419aa736db17aca4a796b1d76da5b8ebc3f",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.keep-origin.http.html.headers": [
@@ -691650,7 +691481,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.no-redirect.http.html": [
-   "2499907edcd214aad8db760c37c86ddc7a4328d2",
+   "0fdbc84123ce342bd2958ff9fae8ae52b0cc7690",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.no-redirect.http.html.headers": [
@@ -691658,7 +691489,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.swap-origin.http.html": [
-   "df82c1d6077ac177fcd049e594bbd51f4febe95b",
+   "7600c3861e97a1d9d3bb20ba54917391490b56a2",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.swap-origin.http.html.headers": [
@@ -691666,7 +691497,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.keep-origin.http.html": [
-   "b01e532a957e61d5fba3cadf2c90ffbb827773a8",
+   "501653ea807547434fae9db6d3ee22fc5c22a80b",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.keep-origin.http.html.headers": [
@@ -691674,7 +691505,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.no-redirect.http.html": [
-   "35bdacc127ecbf66d3327ef12eaedfa7d57fe949",
+   "f9a475e9826fab8ef78c32c9113f44ea18f011da",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.no-redirect.http.html.headers": [
@@ -691682,7 +691513,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.swap-origin.http.html": [
-   "1308365f06639d886ec6a529847fe57eea867842",
+   "6922e02e9ccccb79db2934cafede02b302b3fe21",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.swap-origin.http.html.headers": [
@@ -691690,7 +691521,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.keep-origin.http.html": [
-   "2829b4d582b0b46955d500bedd583410202e6feb",
+   "0c9d34a9f4812989f81e2d7f468f4d8c257f73e5",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.keep-origin.http.html.headers": [
@@ -691698,7 +691529,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.no-redirect.http.html": [
-   "ffae5396c1891821369bcbf7b1ca731631a6c334",
+   "9f1d2a8b3ad609680c3bbcb6469c912b0f18f8f1",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.no-redirect.http.html.headers": [
@@ -691706,7 +691537,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.swap-origin.http.html": [
-   "cc9d8e8bf7665765e669e5731067df86f364bd02",
+   "6cd4fb74815887764326894147eed51042d25f2a",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.swap-origin.http.html.headers": [
@@ -691714,7 +691545,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.keep-origin.http.html": [
-   "9ad407a50433e9b0492a9b929bf0906eaeae1c3e",
+   "1ec5f02f71914174fbc5f5ac487e323ab4576fd4",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.keep-origin.http.html.headers": [
@@ -691722,7 +691553,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.no-redirect.http.html": [
-   "99b61473a4ace3e8dd55b17ae6c173a27a485333",
+   "2bf9d443bcb71136c764146b360a500e6cd72e6d",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.no-redirect.http.html.headers": [
@@ -691730,7 +691561,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.swap-origin.http.html": [
-   "870752b152868555e630d49fc13c6bc63fe0503a",
+   "86e619b3f7f3d049291a3dddf5cfa91a151355df",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.swap-origin.http.html.headers": [
@@ -691738,7 +691569,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html": [
-   "60f1ea68215d9ff44ef777aff3609a77e4589738",
+   "dcf44f75b48471df7235fff20c31dc843821ce8f",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html.headers": [
@@ -691746,7 +691577,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html": [
-   "e23fab8d843edf8b3756da8f51b970d33b21efe5",
+   "effc5f815165093a693d695e373e56356aaf938c",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html.headers": [
@@ -691754,7 +691585,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html": [
-   "c4c588c68929ca640274f3ce20548dffcc04a7b7",
+   "d0cd5e0abdc73cd60f70e2a14d58c510da9c7546",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html.headers": [
@@ -691762,7 +691593,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html": [
-   "852b1235372785368a5855d86ee4dedae87153eb",
+   "1f01ba13835d8ed46c396444245fe33e7387a84d",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html.headers": [
@@ -691770,7 +691601,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html": [
-   "905270aaa738d0bdb66f5c7715d3cb8ee5f45932",
+   "c028b78a476b6490d8070891196ba9cd4b672e22",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html.headers": [
@@ -691778,7 +691609,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html": [
-   "faa4c95cfd8b8d80d3e6b67727864a7c8b47026e",
+   "b314058597f0657274a496a0bf1d01fb2059dcab",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html.headers": [
@@ -691786,7 +691617,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.keep-origin.http.html": [
-   "33f945060b7457c6a2528d14765b0e0bf9d889ca",
+   "87ea9f082da4f08ec21bcf5a9ed47b6f87b9c279",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.keep-origin.http.html.headers": [
@@ -691794,7 +691625,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.no-redirect.http.html": [
-   "94de2118260e20a03c8069cf5d76b53b0ac19431",
+   "d009c2b4aede641cf994a3301f9103d6fe7df86e",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.no-redirect.http.html.headers": [
@@ -691802,7 +691633,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.swap-origin.http.html": [
-   "b830abc6ce695aa5ca0a85086fb96291db03ebb0",
+   "cd91112d52883fc87e40c43f8f5fb1916090a51f",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.swap-origin.http.html.headers": [
@@ -691810,7 +691641,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-https.swap-origin.http.html": [
-   "56802e32559f2c009226d11e64d2d2009ea36daf",
+   "6efa1dc56567a3265ffb319b8dbd80b7e978c16d",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-https.swap-origin.http.html.headers": [
@@ -691818,7 +691649,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html": [
-   "1c3f7101333dc568ce48c04f412aa5fcfc6afee7",
+   "c05839c7d525c17ff9f079515510b78afa9a5c9b",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.headers": [
@@ -691826,7 +691657,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html": [
-   "42d5bb7ee1c9dc749dc5df3945be71680c533688",
+   "f7434f91cd87a020f0136984a76feb22f9e7a708",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.headers": [
@@ -691834,7 +691665,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html": [
-   "68dcf2c4d32486ea7d1f927a0e4d91ee427e3531",
+   "da127b6dd12aa3d0f4982a0ba29e2c35c77a85c0",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.headers": [
@@ -691842,7 +691673,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html": [
-   "da2ccc576a26832c7aec8a427466bf1eca53938e",
+   "bb222956dae439fe0dba3f5f4241c67cd906d7b8",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.headers": [
@@ -691850,7 +691681,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html": [
-   "5f461dd44bc599dff9e730fabed2dbf414ef5170",
+   "2b4c9acd80c8b30aa85a7b7727e25368ae805d8a",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.headers": [
@@ -691858,7 +691689,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html": [
-   "8b5ca0cb32dce2a16ab9c0510328c733cb1f0c8d",
+   "6534263de0239edde5c69f5d61d616ac9f725dbd",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.headers": [
@@ -691866,7 +691697,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html": [
-   "02e82e344e05b4b703945344cfd385deb6e354d1",
+   "1d2003410aa7a7073b75d4cda6c28635045825fe",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.headers": [
@@ -691874,7 +691705,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html": [
-   "9974b08f9058c74880a7557f53aa79be5b32886f",
+   "e72281613517b41062f833dc0ed02fa0dad2872b",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.headers": [
@@ -691882,7 +691713,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html": [
-   "71255af62be912ce8c770dd12d1089247dbaf18e",
+   "3bd8c2a6b3739aa1e6847e0b25a1c2dff40ae6b9",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.headers": [
@@ -691890,7 +691721,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html": [
-   "7627c3242776ab774bce819570974f29921a23b8",
+   "3d88338d55afe9d3ae879fe4e6dfb2983db2b54a",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.headers": [
@@ -691898,7 +691729,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html": [
-   "588c39a8a746eef67c4cb008dc78fe5002786ec4",
+   "4b84b70673b574fc6074a6f06c200844eb3282d3",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.headers": [
@@ -691906,7 +691737,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html": [
-   "9374e472301a8028744b9588454a7a21dae66a90",
+   "cceca42b52f2bf3236aeb75574a3d982a994e4c0",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.headers": [
@@ -691914,7 +691745,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html": [
-   "27f377b5479e4f2f257820eb49bff083a51e4d41",
+   "f5bc1f0282c837dfceb4589f59d209d16e01d86b",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html.headers": [
@@ -691922,7 +691753,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html": [
-   "3073e88ca2235b75a2fe9b4dd156cee76b96a59a",
+   "050e8740045194f5ceebcabd5af050daf4fbe0ba",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html.headers": [
@@ -691930,7 +691761,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html": [
-   "cb7947261a6218e91d401af2418271c61f799258",
+   "14b3b906afadd3dbe4ff0190045741a67269554a",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html.headers": [
@@ -691938,7 +691769,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html": [
-   "71af3259014a6f1736507253b859befaff4e0d3b",
+   "3cc34473467d4f3cd78ee724a793c14a999c78b2",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html.headers": [
@@ -691946,7 +691777,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html": [
-   "81d8cd1a670b5db54e18fa1b1cea1b8dd212b678",
+   "01a026681f1dee1bf0c179ca7ab147f87c2864d1",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html.headers": [
@@ -691954,7 +691785,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html": [
-   "fc3807c8f532538d226f65eeb4caa3691f8bdad6",
+   "573a019bb8f939200e52325dbe81b8d00a24e59f",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html.headers": [
@@ -691962,7 +691793,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html": [
-   "86a50df759b5199ce24ee025efbb5cc0f93216fa",
+   "99414a5e9d4e4c97022ff391da3291bcaed93d4a",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html.headers": [
@@ -691970,7 +691801,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html": [
-   "c6e0d03023376ffb9da91c62e4b5f16304200997",
+   "fcf931ca354d6c74bff7ed321e028136b336f402",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html.headers": [
@@ -691978,7 +691809,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html": [
-   "5d536fc2d2b9501bcc5478f5b254bc75312fd95d",
+   "caabd002d300745a5d496b41b8e04b6be4b95d9d",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html.headers": [
@@ -691986,7 +691817,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html": [
-   "74bd3a07ffd0bdcf3a07f4efd190975f0c175f98",
+   "6b7e6a80b0464b103dc516f81122197fd4fd78d9",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html.headers": [
@@ -691994,7 +691825,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html": [
-   "d21bc0c63a24ea9ad8a27ecf88c0943e43dce1c0",
+   "997119a03c9cdfa53ea8b455b69dee2656b06c84",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html.headers": [
@@ -692002,7 +691833,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html": [
-   "6b265bff090dbaeaaf3f2c5e263ac8a7f126ce29",
+   "0a4d8e06b8dd87abe2b2888227e7102c3a1dc1f1",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html.headers": [
@@ -692010,7 +691841,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html": [
-   "8813bd80517772cddb07701e0df94759e0383b1f",
+   "6680d9a81091780fd8797e9fcaacc7bcf7cb72bd",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html.headers": [
@@ -692018,7 +691849,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html": [
-   "8465399f8e6c237ab0fc15cf60a0b8bd7ece2812",
+   "c0f490f4ad6a8bf72e9adeae9973c534c62ec737",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html.headers": [
@@ -692026,7 +691857,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html": [
-   "13645cd4ff9aa2d1cc43e81cf783c45669eb203f",
+   "04a8cdcf1e5e980cb9cf4b0690f30037ab3d3109",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html.headers": [
@@ -692034,7 +691865,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html": [
-   "a669d0a024da1f9e8eb198ba999d1fdfa0ce510f",
+   "f25896a4d99140ba6bd73b83d0150e02a278fe75",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html.headers": [
@@ -692042,7 +691873,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html": [
-   "cedbee9f67f1b3a58407c769163e913ce54ae1d2",
+   "119db9da9a0ef6e9bc68da24246caf06f8a4bb86",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html.headers": [
@@ -692050,7 +691881,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html": [
-   "5b2dba40f94c2ca57309aae5eeb755117b9ee5de",
+   "24fab1eec6e2f85e1689c7257d22cc5d67849825",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html.headers": [
@@ -692058,7 +691889,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html": [
-   "909b92bfd508e7a13d36761443ba897df4569d01",
+   "80d28c9ab4c4ddae4f6505bd3c45862219d2d81b",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html.headers": [
@@ -692066,7 +691897,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html": [
-   "4c207021bb78a1e773a86bf2c025cc78e36c7167",
+   "1cfb75020a0d0478ced77d2de3f46ad6f55b979f",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html.headers": [
@@ -692074,7 +691905,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html": [
-   "a8eb7fe9173ccec09654b3f226a47c58bf70195b",
+   "e72ba1547c27948a97ba8ca15b3fd9c27433205e",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html.headers": [
@@ -692082,7 +691913,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html": [
-   "d131ac349dd63be99721edb5a9bd2dd16510d332",
+   "bfeb494d66fe6e2abeace3d888a2c700cf1bacda",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html.headers": [
@@ -692090,7 +691921,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html": [
-   "83d055f7067eed018c001b827843e0745c246b94",
+   "9ed0e1bf52ce223b37348c5fbb0d7109731b1212",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html.headers": [
@@ -692098,7 +691929,7 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html": [
-   "a8570a0ace064766ab88a6e5732dba761b2fe4da",
+   "f976183aacc8e1a51e9e60f08d9729c29b615929",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html.headers": [
@@ -692106,855 +691937,855 @@
    "support"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.keep-origin.http.html": [
-   "6f7a990c3628e5cbe9a2d875276b7ed2d911f05a",
+   "f35f4f9d62898a9d45114090703ca2ca468102ac",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.no-redirect.http.html": [
-   "372dc54da900f8d705fbe8fbc325aef4e0d04221",
+   "46e50330aee9532e366f915a618696637bcaf9e2",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.swap-origin.http.html": [
-   "a7c824ad849ab94026204112d3b6b0c2924121dd",
+   "7f04abb3832c589c03fd6c313f23ceaba01af459",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.keep-origin.http.html": [
-   "a6b479af2270cc9b67253a50ff1d72115912628a",
+   "ce045a716f08b163a6541f2b2b780539ecaabd6a",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.no-redirect.http.html": [
-   "adf1a64ee3ab05a82f222c256835bf3cce909e21",
+   "533660ee47967d603304233e9c3e44caa237f7c9",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.swap-origin.http.html": [
-   "8a5191c15d7c09031fc1b0d04a5a1592bbbda70e",
+   "4e35fb2b7d46c72349e015163f36142f9ca45e39",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.keep-origin.http.html": [
-   "3399f87e517082b35d4f195c292b6a6c09cd949a",
+   "2ffa21d9791b85764fe49d465aca693a4076c69e",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.no-redirect.http.html": [
-   "7c650385210ef37f91209d0691cdfc10e6b00850",
+   "74e83f43373ff7e786b02e2f931f0653cafccf8f",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.swap-origin.http.html": [
-   "e5c6ef5c92ba207dd33407feb383eda057bfe4b8",
+   "028f7da6a1c45a6726943d829ac195bcc9d0bac7",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.keep-origin.http.html": [
-   "548db299dc676347e51249a4e9a98fe43a33a36d",
+   "bc777fae384ad3dfb34227c5b429cabb3f938c9c",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.no-redirect.http.html": [
-   "966c035869b2c7c5c8450588c6dfd9bb206dae1c",
+   "9389f18bb6f2169267120731d4581fc020b65806",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.swap-origin.http.html": [
-   "c195ca6fbf17ec8964822593dea02d22cfd4c86d",
+   "761bffa81c557369ccc88c2efd8f9e2280064d2a",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html": [
-   "373a9d8b424df64de229e452f44c8d0fde787931",
+   "2950bba1a75e645068b2f57df444b90695be2f39",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html": [
-   "003e81f97cc71cefb1ae845484740766d52db0c5",
+   "be2e12b89e21582dc1ffebe22dcad68bccd8b1fd",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html": [
-   "c2ac0fa7c58504f5753bd6e68ee469949b96b49a",
+   "1d299ff465bcf4e808ae3173eea10b2e889e485c",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html": [
-   "5d3fe70c29f26496c38e7fd557229fa8552ae5ae",
+   "de6243fed8b315c93e38d21a12e72aeb3e1f35ce",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html": [
-   "ae5b1bccb9e71e4e81b15a13ac544f745120a380",
+   "af4d19e238ec43646ea224c54822c84f6706c642",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html": [
-   "6fc4bf67a6e0bde78cd54ea9165dd61fb5df783c",
+   "6ccc1ebc335aaa805d1aa106280572a286ce2a4e",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html": [
-   "13a02941aae3f83dc6b549874ddcebde4aaa8a2f",
+   "1d4a6bec05f8473f0d0ea7b9429622c9079314f7",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html": [
-   "018e4e1e31617765986d38036141917f12dfe890",
+   "8a91acb59b4d8a8ceecf7aef84bcfa6fc140b4ba",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html": [
-   "db653dd595df891c8e1ff96915e419198aa0db2b",
+   "d682ec14538ff4ae37eb5cbb30f5eca0b999d6e2",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html": [
-   "d40e774764d873cbefef8b1c70264ee6625b49e3",
+   "43b67209f54ecb55ddcb75de68e8a72648dc9f84",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html": [
-   "96d38f157ce565300a60eac4702bec9142b0e636",
+   "8d10af50ad3858876f34156769507539ed24ab66",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html": [
-   "d03f111c04ded484a9abd550be71459f475b212a",
+   "7c06426b42e736027e4cf31c941f0fdb5d846a43",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.keep-origin.http.html": [
-   "7cb49559443abb6e79934d0559ad920d85dfaaa2",
+   "0e0cd8f42096069769db6d36a933297809058991",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.no-redirect.http.html": [
-   "2761d9697a3574791661c2b2897be63d5943bb94",
+   "c7e2bafefa249d55551d67eb88c71e3eec37fe02",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.swap-origin.http.html": [
-   "2bb50f41cd50b4750fd5a66e017279b11b916461",
+   "f04548cf899d3c80ffc92032c5f70272a3d0b0e3",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.keep-origin.http.html": [
-   "383626d315ee6d98e775ee04fc03fb75dcad91bc",
+   "ad29794a1ce53a3c35eb0d1ba76f7df4f0da231b",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.no-redirect.http.html": [
-   "5e55b6dbf849a4bb714043366ec45aeb74212528",
+   "4387d0cf4ac9ff451d5e50be0f0a493adcbc505d",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.swap-origin.http.html": [
-   "f8c89cfd7714b32b013183821b6fdf633d9f81a1",
+   "545b751f4f8059046daacbf70ab6a6b9fc97e504",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.keep-origin.http.html": [
-   "cf127d3c0760bfacd57d59368d36b33609820abf",
+   "f8a81a8af3363fcf9818d4eea40ec2850b903a9d",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.no-redirect.http.html": [
-   "06ed034cb3018fc5ea1b96b098b3389d4823d889",
+   "e0e31503ac528e70355ab81cbece73b28667324e",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.swap-origin.http.html": [
-   "5e718a4ff59b681569812b2539dae59a6216672d",
+   "02576c22a67c3eaab5c677d626148c65dcff7a8f",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.keep-origin.http.html": [
-   "e7e5b117869c7ba6357d2edd4471cf2c037beb85",
+   "e9f8da0057b4fca11a49abdea85e21c88d0d0c00",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.no-redirect.http.html": [
-   "ce595e64c30a824ee4a95ab59d465b31f5bf39c1",
+   "47a215cc5b1af26983749ec2ad36ce21967f5045",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.swap-origin.http.html": [
-   "35e1331279f56d3dcd556259a33a9b8393ef03de",
+   "fef59b4619869715c29f0aca220ce1cf1b1aeaea",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html": [
-   "3ad010c5bb82e9384acea653de648fb7fbb9233b",
+   "0b3d4a144e1e3d3745860b87d5dfa98ded8b4f3c",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html": [
-   "e0aed40e21e1ef417333b8fbf594de5e983af090",
+   "c1bab0c9f879982a5b0d734ada003f8a53f0407b",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html": [
-   "6d1b9cd64b14a1d02bfe24d35e8362c742b9c577",
+   "4ae3a00e4310ab0570b30bf1e123ac9ba2d4dfd3",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html": [
-   "a9d89ec6e67f1a3608c189ec255a248b4f54d6b5",
+   "4f178a66e431534bfb9e2507d38e9ea597ed38b9",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html": [
-   "1a8fb14d32c17073363f79282683b61ec4543530",
+   "e3e0887b888f34023fc60bbe760963de2dfc79b5",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html": [
-   "fd4e31303624ab3d813bfd9ede590b5966c1448e",
+   "be2eea323dc3726f4343bfa307a39891ee89c7b0",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html": [
-   "7a0cf11776236fa0cbe65e48d6d50b03f161c461",
+   "4f9345f3ea0b31aad44bd292a63ac6abc4893e3c",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html": [
-   "a9d77675af77d3b46e67d7f42f3236a80c382c28",
+   "e162101d56dbbc7c535d703bfcf6e852d66d657c",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html": [
-   "6b1232ea83a255a0377703f9da1e74f777565c1d",
+   "05e47dc0f9934d8c907d8af57bffe54188c73b07",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html": [
-   "24907de0dddf2eb79f70607e780166e029df7ff3",
+   "c7a0e1d8368b05c3b5d2207af2a55a03f67d6443",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html": [
-   "f378b6a78b9b32b7f9fbf6b9364161cafe4d3a03",
+   "04e3160a659a11557887c2a97bbeb9df87688b99",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html": [
-   "a2b9830828cfa80c86cba1e1d8ea2e0157f8befe",
+   "d9734ad707a3fd4cdfe1befbf663d60fd811aaf0",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.keep-origin.http.html": [
-   "094228a3afd60c2b5d656f39c75438d4a3964842",
+   "6c810a7a7e0806c877296d3a3a83084b8202dfe8",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.no-redirect.http.html": [
-   "5f9428c18c7312f9c8c7528dffac801883afb9d6",
+   "6aec28f4d0d4a0053666dedebf8dedc78554ecae",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.swap-origin.http.html": [
-   "26bc34564da8ee175d27b33984c7858286b60e2f",
+   "973d27c7e867e04075718627647dceaf870b6f78",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.keep-origin.http.html": [
-   "70733ab2c0dd61fcfca1c4d8e13d1e941467080c",
+   "a58c210d4b4674e1ffb917e42fd9fcc82837277a",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.no-redirect.http.html": [
-   "23913adba9bed4814fb8f1f348ff6710d4e1e7d8",
+   "45be6a1c2456827b50f7cf6ac4c1208e466dee67",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.swap-origin.http.html": [
-   "0ea5027139c225e38c5e68306264d27b48aaf1e0",
+   "0058103f504f509feb854aac66119f6f9ff041d9",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.keep-origin.http.html": [
-   "9fdd68c95bf3c010d9e0cbbfe5e4cd219a3938a8",
+   "fa51fba2bca2e2c936fdc9cf0666eb1efa301c15",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.no-redirect.http.html": [
-   "568614792d4109980fb47c515a93eba406c2673b",
+   "e863e5bd5de691753f9550531b19124dc10f58c8",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.swap-origin.http.html": [
-   "f40179f1141fecdc18e3f2db34cfc12bcfd4aa0e",
+   "5b24542ef6940c77873a4af8292c40b200109642",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.keep-origin.http.html": [
-   "1d5e7900eff4efb6d0fd0fd36aaf40b412a991d1",
+   "0ddf2ba683aa40a8c990e215797da973830b3577",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.no-redirect.http.html": [
-   "8e7a1f533c5d1eb70f710a020661993bf6710edb",
+   "cad81813e798e526f2ac944cf1098bdb81e9ff16",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.swap-origin.http.html": [
-   "ed7b1d9509e779183459025a64bf1462b329804b",
+   "0eb837ec08bfe8347f0bc501a2f6f38e47c821c0",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.keep-origin.http.html": [
-   "5c14128c986d07dd91f703616c56d498af377663",
+   "882e2bdb30c86735b776f458464b89bdd5e6583f",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.no-redirect.http.html": [
-   "3b7701e517776b5c7b78872322e683b70c04f3e9",
+   "0bd6e26710c738aeb95a1f8f9b42777dd69a2b05",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.swap-origin.http.html": [
-   "e246c04f341a0cf2cddc25dc5cc93ada08ff372a",
+   "f14573ac4f1b505bb9e07cb5652fd7d79683adde",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.keep-origin.http.html": [
-   "4cded5e75da38f89356019251675e4d43d5b2e55",
+   "2685033ec3ad033b45c14d79acfa0899f9d9cf5e",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.no-redirect.http.html": [
-   "ed77770515050b44db2633303d0bb5059132ede9",
+   "566c7707e105706a5387294b10100860ba2c7df7",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.swap-origin.http.html": [
-   "561c181557a515c4809d466809710fd8d9c82388",
+   "05a331609f2131993e3fe122ab47a1fb0c663d7e",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.keep-origin.http.html": [
-   "146db70d656d5da6b6c23210f9c471e8b46d0c20",
+   "4dd3fbacf58425fa953d15366ce5e2a3cd9194ac",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.no-redirect.http.html": [
-   "3873d734875f2462c754794b346c623436b9627e",
+   "d0e4063153cfbda13aa7cb9967aa869cf06d6742",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.swap-origin.http.html": [
-   "35ee0075ae63111888dc94382d6ebfa7baf11da0",
+   "7b9571af516c57ef22231c9ebec0852c0583a572",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-https.swap-origin.http.html": [
-   "91ba1db649367dab27ceb143e083f449154408a0",
+   "a8919e6e6d62e7156aa1ace5b33def6afb067986",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html": [
-   "f78530b97168a7c502fcee262ade4c5962c7fc45",
+   "bed8df8fa8df0c9c0595368fd01b9ee329ced87c",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html": [
-   "9a1732e53a1c0352108d5a2ed7adeacc5a93714e",
+   "279a75d9c8688e87fba4638a548dcee8d1eab5bb",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html": [
-   "74bbb2a16230f203f66ba5f204224641af2828ad",
+   "017ef55cfd0a096c86684857f176563e12ea99e2",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html": [
-   "0f535518d652f4920374565cb42fc07e415c85a7",
+   "648b3a3408552d1fdd39b2a3c84e8357ad7712c3",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html": [
-   "15c3bbd4d637734a15072830ef4133085275dd64",
+   "e06fcf8dd3d52d20b54d04e915cb9d403af87bf5",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html": [
-   "be4657ff223a65bdf8d26b3c479c88213100cca2",
+   "1573879b70081fcb3b32c236a6a9615b6f86d830",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html": [
-   "294746ee0d36e710da80cdcb56cdbccdad35d8b1",
+   "8de9152129342180272cb1f9c8975b9f9612e94d",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html": [
-   "dbaab80be69738669095d2b4c82621c92a948a17",
+   "a912f8c3353b3c3a6dcd95dff6d161dc351e2bd6",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html": [
-   "9eb466a64bc1304f53208d565b453d01ad40adce",
+   "9343c0f844eef5993b1f97484b071fc7b2ab66b4",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html": [
-   "9394b8586ed8df5aa20000cd28da66036d0045d8",
+   "804b2d319f084e7a1901fe552987f98ff292734f",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html": [
-   "1c7639d2bc68a5ce46619730dd24c4c6a0b04916",
+   "3f2d5c87e6bcf3bc118c2094446db717c6f30b24",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html": [
-   "0a88d3fddac3fbd03bb707799b2e1c7846e32b6a",
+   "867558acb76ca1a70294d29106020cdd20a3fada",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.keep-origin.http.html": [
-   "37ac098b52c2496a6ab6b69647cf234ea5743bde",
+   "ab1bb44662b51d8eefa22e6d43d5fb15f8f8ae12",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.no-redirect.http.html": [
-   "baa6526c61855a531044825faf9e3952ca8f3dd8",
+   "154fcdcdc9eebc541ddb9258a31b95d3af34e797",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.swap-origin.http.html": [
-   "94775ea99e5f1593fbf7b665177324bb73022e86",
+   "d24f9f72ba5186da2b1317315912e60d386bf4d9",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.keep-origin.http.html": [
-   "a3b8554b4cfc4614aff1bfd3f5620ed95bdc68e6",
+   "e69575707d3ed16340f99652860c5b230199b824",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.no-redirect.http.html": [
-   "084f3dc1574e5f2e57bced7cb508800a8bafafb4",
+   "a97ff758e1bfe23b4cafb35908f0f9af939431bf",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.swap-origin.http.html": [
-   "aa7eab66ffe6122d1756e723bd45ea01836b8e13",
+   "f0998db7eca69cf7708f545dbad6fe8c578ce3d3",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.keep-origin.http.html": [
-   "8e17a98987e785357904f82f5b948524ec7ed505",
+   "98761398f61ce5715436688a2864ad832d6bb2d5",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.no-redirect.http.html": [
-   "28878e2b1c24cb954a9f557c87dfa2c5bf456497",
+   "2e9ac8c3e49bb2ce4ff8f2b83ba2464ea1c618d1",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.swap-origin.http.html": [
-   "40e8f64bf2dd950c4a5dd5e0cae1195fc03744fd",
+   "16b2fc085f5f4e36a763e98e9a6150f9fabcbbc2",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.keep-origin.http.html": [
-   "b8f40d6493b2bfefe362ee18a1f8ba3d88405435",
+   "098365ba4d2261a43c661deddcb8532282dc55fe",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.no-redirect.http.html": [
-   "d287d5e473137845e93ac023ab2d9493e8cc8af1",
+   "2941add0f67b0cc72ac2b9ece06726e59f045284",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.swap-origin.http.html": [
-   "aeb97eb880967f71f284f6618cbb0ea1a127d46c",
+   "b6b4cbc6d8b6341acbec81f1289414bfc0ea64e8",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html": [
-   "f06f701b30afc7736f7627f34c10d48631b85ef6",
+   "3ad3d020d7f67570775a4726443b57b6a5a2c322",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html": [
-   "e0d56f42938dc05a6a21c27a71e2a064a8e595cf",
+   "fe66f6614d4870a3f72265003c362bfd945889d9",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html": [
-   "9cf8b085f8d26b196ed00db74946add27e0871cd",
+   "e3f2f3bd1c9103c970d0a06f55fa60becb1bf71b",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html": [
-   "c6536bde928e5d6e75d5c0dd4741985443a74d21",
+   "3528e78c77c316e90ff1e41111ebcd131a5ed4df",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html": [
-   "d43e6a2cc4b3a06cc09359b14389107d93debde0",
+   "a45b53d2228935ce1deec30f158b4743a4131237",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html": [
-   "06fbbb9e1fe0e28077440dd992f60dfc1249a330",
+   "b6789f90c1c22a2a6bdda8f468409b211be4cdba",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.keep-origin.http.html": [
-   "bb76971c646f9c30fa5905c73762bdfe19040a1e",
+   "d1105d22cd8aa86151f56e674dd7eec75c3b5524",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.no-redirect.http.html": [
-   "f28611bd39f09ad53364f8f594686924624a2f91",
+   "a3b470858f4d3f25c24c664a44bbd0eb531ed7d2",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.swap-origin.http.html": [
-   "c52383aff712992c66900d49d5d30788af82aad5",
+   "4fa99cad125eb7cccbddee9f92f087575c54f5d1",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.keep-origin.http.html": [
-   "ebcfe405b0e9b8435899bbfd6573c0a1a5ca0146",
+   "d54987913014ab20cd0e1e8c423120dcb035419d",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.no-redirect.http.html": [
-   "9f7d448282bc6a2591016a624991bd67b0637d05",
+   "e06f10ff2b2b9798e89d4c6e8afc81de8642e7dc",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.swap-origin.http.html": [
-   "208c7a7a139ef2a50ea58023db11d746cbf5c649",
+   "a412e4c220c4bcbc086f149660926cc442b6fda5",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.keep-origin.http.html": [
-   "6f7a990c3628e5cbe9a2d875276b7ed2d911f05a",
+   "f35f4f9d62898a9d45114090703ca2ca468102ac",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.no-redirect.http.html": [
-   "372dc54da900f8d705fbe8fbc325aef4e0d04221",
+   "46e50330aee9532e366f915a618696637bcaf9e2",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.swap-origin.http.html": [
-   "a7c824ad849ab94026204112d3b6b0c2924121dd",
+   "7f04abb3832c589c03fd6c313f23ceaba01af459",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.keep-origin.http.html": [
-   "a6b479af2270cc9b67253a50ff1d72115912628a",
+   "ce045a716f08b163a6541f2b2b780539ecaabd6a",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.no-redirect.http.html": [
-   "adf1a64ee3ab05a82f222c256835bf3cce909e21",
+   "533660ee47967d603304233e9c3e44caa237f7c9",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.swap-origin.http.html": [
-   "8a5191c15d7c09031fc1b0d04a5a1592bbbda70e",
+   "4e35fb2b7d46c72349e015163f36142f9ca45e39",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.keep-origin.http.html": [
-   "3399f87e517082b35d4f195c292b6a6c09cd949a",
+   "2ffa21d9791b85764fe49d465aca693a4076c69e",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.no-redirect.http.html": [
-   "7c650385210ef37f91209d0691cdfc10e6b00850",
+   "74e83f43373ff7e786b02e2f931f0653cafccf8f",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.swap-origin.http.html": [
-   "e5c6ef5c92ba207dd33407feb383eda057bfe4b8",
+   "028f7da6a1c45a6726943d829ac195bcc9d0bac7",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.keep-origin.http.html": [
-   "548db299dc676347e51249a4e9a98fe43a33a36d",
+   "bc777fae384ad3dfb34227c5b429cabb3f938c9c",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.no-redirect.http.html": [
-   "966c035869b2c7c5c8450588c6dfd9bb206dae1c",
+   "9389f18bb6f2169267120731d4581fc020b65806",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.swap-origin.http.html": [
-   "c195ca6fbf17ec8964822593dea02d22cfd4c86d",
+   "761bffa81c557369ccc88c2efd8f9e2280064d2a",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html": [
-   "37f6fd2a404aa1855bad3bbb0ef4bb22dafeb903",
+   "2d7e93c906b2cbd898e48a527ee2e23a1e2335c1",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html": [
-   "2942f9ccf54222ec8fcb0f79501a87ad9487f1d8",
+   "016ffb87b5f8d302755a6b1e6745443e9ef1132b",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html": [
-   "a3659cfe9ff416c00c46f635f08603cd60e4173e",
+   "18766cc98a954ab1dc24aa3b82da256979986ca2",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html": [
-   "6583977d468f963623d011deccae6d77fb50a97e",
+   "862c7297d51bcc539fca121d89cc1cf323e5d318",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html": [
-   "780138004f927a366ca8ee794f21da27b0864e69",
+   "9413546b07d6229e3f238ae4290257fea9ab0ba7",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html": [
-   "b914ad4d7398c41492be97e92099273444087c36",
+   "5661283ef0b5639a6424ee106256258e55db4734",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html": [
-   "d2f057da0254b49f5154b82a8273308486a1a5d1",
+   "c2b0cab8a1721a4d3738e6f2e6a9c3d343b8d986",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html": [
-   "fa5f521e4bd8add320875dae12521962c2466f4d",
+   "67a7cf11cd9186e15c5fa235674bafcdbc32cda4",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html": [
-   "ed1728d5e296e300c2907b4db9f0ebdf3c592d0f",
+   "435d78e20d2cc68eafbbd13d0d9223d6186648bf",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html": [
-   "98105d7714acefc476b1f4996a6e1a774fc91bd3",
+   "e945b6bdb6ed91232d53077bebdc7bb31d38a397",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html": [
-   "20f880acc54cea49054115d3def89c08af7ce150",
+   "9c5116465bee8f00f00e17fef5c83536c2abb8fa",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html": [
-   "a454f59feabe78bafe88536dd528af020321199b",
+   "d8d0e2642db7247bc7bd61a8e37e6b5c53a8ae60",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.keep-origin.http.html": [
-   "09d2082111a9f992fb7b75a099b4270c9e38189e",
+   "0e867173f6acfc435cddb6d9636f299b2b6d95c9",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.no-redirect.http.html": [
-   "508eddd0980aed13bd6a9a52d1c6bead6a61dd02",
+   "32babc6af8d6378cd76d425942941bf51c56ca41",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.swap-origin.http.html": [
-   "326e2dfee704310541e5ba25ba04ab3cb0f1361f",
+   "ee52a7773e32d3fc7445024abafc1ac679a68223",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.keep-origin.http.html": [
-   "876cc6eb2ca0f91c213091186978cd45ce4f1926",
+   "93e73e77a784088f7a405dd15c0e540b004f2cbd",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.no-redirect.http.html": [
-   "5969cab93a01431727677ed2f2bf2c43ad3b8fea",
+   "d67c6fcf20f91df4c5145c223091c9971b64ad95",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.swap-origin.http.html": [
-   "b3f753b4c33efb9392abb81b4a7ce3762895fb15",
+   "0f1f958b931f6e96616839322c2997e9cd019723",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.keep-origin.http.html": [
-   "2292457180dbb44ac9f0632336ad243ab1784680",
+   "ad9edec08d61535216e3702459c23912e88a06fd",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.no-redirect.http.html": [
-   "79f359fd826e944d3ad1d1c52dc1d6eeec696036",
+   "337521b5995975e0a8e568ccdef92c5cbbd128a9",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.swap-origin.http.html": [
-   "cf5648454600042a4f003949febc665d580c642a",
+   "98d39e522de1b2156571c9e071cd7c9b8348d0f7",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.keep-origin.http.html": [
-   "de2adb477b7fad358051016b183a27f35b2b6ef9",
+   "6ba35c7fc320ece3c74370ed7010ff5f693fec6b",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.no-redirect.http.html": [
-   "bbfcbd3d48e8a94f07f07f846c7e36ae140dd685",
+   "f9b850b9237e935d837567a91c18e7208996c31a",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.swap-origin.http.html": [
-   "7e7bc2003695109109132bf5326c61d9fb192a2b",
+   "bc62feeae0fa264a0ef2729e3dfafadbec83fbe5",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html": [
-   "3c340cb6ddd736c9d3cb6317cfcafac3388561ec",
+   "5d061f4fd38ee1aafa3c2fe9dda8e626c0ef365c",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html": [
-   "4d9c9ad4e2b7f63813d9ba72eb2a5965622b7aef",
+   "ceada990e70059428064895bb19b74d976eb03d9",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html": [
-   "65828ddbe43e6d0495f35ff8e2b1283e94262d5b",
+   "ed500f68b73d4cffb573bbf7475e586d3d1c911a",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html": [
-   "205e957b4475a190efc34f53765edb2acee6ae3b",
+   "4d73ccc71114a3b47dd2b2469bf9409b704c9740",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html": [
-   "11360c8396411f9d68344670b06acd647c016b0a",
+   "fcde2e4b56173f4c7d6d6b22712f2b6434dd34c4",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html": [
-   "11a17fa1a5d4204dd7e3a38a569998290923243a",
+   "2a97d907933a1b6b0c664059fba3dc231f11a9fe",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html": [
-   "67c954be9ebb86f3a7a0582012dff00ef8688509",
+   "bfb05f04fe5cc10e50fab8ac9653931a43b95fc4",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html": [
-   "ea8a89bb387054ecb6acf1cce94d6232567b5441",
+   "5bd8cdf1e89c3305c25a6679fc5e11655ab09ba9",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html": [
-   "084d24a38ce79c28d9cfbc1fcdf86fd33d986725",
+   "6624377f8ad0436f4c693d9a549f0312e2643d96",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html": [
-   "1e8247776b0845913a4be367c26e1f39ffb770ec",
+   "41d8e411e71c22bd052123c1693b68e60d29b296",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html": [
-   "bd29bf94c24b17d330053dad9b906e77bc6dd46f",
+   "820c6a30064f4da63aed73228d2bab7b21d5bd23",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html": [
-   "58240b9faede2c039448a30448feeed35b6df23b",
+   "0114621aa7cb6467ed2ea17261deac2eb86dd0a2",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.keep-origin.http.html": [
-   "fdcec2041e476318cc7981f0f662da2acb641878",
+   "c6b74361d5a0f5f61ecfdccf6ef4614261cdeae7",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.no-redirect.http.html": [
-   "c436821e3b0ff4a385f5e844cf2849e56b580317",
+   "ae5804351b0b8b8be01d777ef93af6495df6c9c8",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.swap-origin.http.html": [
-   "15d16ec79937db4c31e7c3e5d617f31e9e723176",
+   "33c96640cfa164818e1123aeb248fd83fc49c588",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.keep-origin.http.html": [
-   "b5aa883d3fe45df1751107ea3bae94727dcc0146",
+   "0316addebf6eca4f4a8c9098bb00f8f815ad9444",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.no-redirect.http.html": [
-   "c823f712f95c1eccf39dc6b42bad14a3bf9c2175",
+   "5521177869cf8469ffe2d0d791da5df981db5fa6",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.swap-origin.http.html": [
-   "7bc80256b5270c1982086697745e17ba78997a79",
+   "e77bb3b0cf1cdaf6cafdb3949031379cf78d88f7",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.keep-origin.http.html": [
-   "ba251eb6af55cacb9476904ac8360cebc63e82eb",
+   "fdcc1c93a8a11e2c577a35f0ee91f2780e71fd94",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.no-redirect.http.html": [
-   "5790465c573165501418ca586b5cb8708a35947c",
+   "70bd6bebce5fee9207d56fbfe9b0d06bb1fcee9d",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.swap-origin.http.html": [
-   "b1834ef253d9fbe2183d2cc27d89ecbe5607ed01",
+   "a94dc36b05741bb659d4df68a09380ef09d5ef92",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.keep-origin.http.html": [
-   "6b942390a10f35f7b386e61105884a6c0e111f27",
+   "2810f98857939396d125c7537d48ebc36419a68c",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.no-redirect.http.html": [
-   "9798816924ae99ba6b8b4217527ed95f70fae7a1",
+   "6a18555b9a228f5ed92092e7f3dc3f09667e5c15",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.swap-origin.http.html": [
-   "56f71d7a497ff1f03781d3c4c620600d2c330b42",
+   "812ce1d19e71f2ee2dc359bb671e76e12a8625f9",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.keep-origin.http.html": [
-   "3da9967a951584c680aba99f2d63eb385c8f426d",
+   "e18fcc77d55292486c81676148b47a1269e7b830",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.no-redirect.http.html": [
-   "c17b37bc438ecce2659e893015c2222b373f7551",
+   "63ad650a18eea0d32ef1547dc856889e6025f768",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.swap-origin.http.html": [
-   "cc3fee68658edef25b7c92e10f61192dc452f862",
+   "0bc77a7bb82b9f461f4ad935182784322af6364b",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.keep-origin.http.html": [
-   "ea91c863fb941e7a461853316165efa8f395744f",
+   "f7131c53137a3f8ebf1dbd58d7eaaf8cb843fc12",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.no-redirect.http.html": [
-   "71a1ec3646ee0c337c39ef73bf6506993b23c3cd",
+   "83a1cf8aab42aee555e36cfc2c11ab401e92a312",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.swap-origin.http.html": [
-   "737fda730ff5672b042108ad7d612642397d30b7",
+   "ced54f76ff4fa94d2a43495a463781d628e6ce6c",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.keep-origin.http.html": [
-   "5a62982a6eb1cde102aa3701bc3250c46752ab0e",
+   "68aa52ad260a62403c6a7fd4dc1f1f09c40171cb",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.no-redirect.http.html": [
-   "e3b14f52ca002045b4806fe316d9cf028329949b",
+   "e831c0effcb7c7c780a02801189b3b55e47b992f",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.swap-origin.http.html": [
-   "effeb0a9a885cc0f9965bd241945401180be43e2",
+   "0f74309a16a0d45291af6de14412b2101542cdde",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-https.swap-origin.http.html": [
-   "4a1aee99c9819bcdf20fc6da370e944609a89e89",
+   "6687a674b7a2fa79dae572929cb34e4c9cbad820",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html": [
-   "a817b0fff97b2a4e2fa34ac93fd9e415e156c7c0",
+   "1c0425ce109a9abaa3a972b178c69b60fde00890",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html": [
-   "03ca6e5c4c24a898af3debd43448778e9d8b2e1c",
+   "ff10415547bfddd633e1668e6b257307bfea4284",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html": [
-   "54756e4e50e10c8d6878aff300caec80643e617a",
+   "206cd9c25108351c44e12546e0923e9948893c59",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html": [
-   "2496ca3d6013a8706edd5a29d53e6a2b7c5b4c01",
+   "493de2bceddb1a1bab06c5509b099d82f74cf28c",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html": [
-   "665229e526bfee640496d75f9db0ac96f379847c",
+   "6489ded73f48dcc2b67fe6a82d88889f8ba43636",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html": [
-   "cd3818dfc3a4c0eac29c87275e1233f2b6461d51",
+   "3a661a3f495ac4eb4fdb90f01798e58828832ef6",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html": [
-   "ed018a7e87e6092ed4e957d0acbb68dc66551dba",
+   "f85f0ba58e62422444d142bd9c5e07583a22c022",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html": [
-   "2429d19198dcc8716d3ae7c3b8edb931f119c241",
+   "cfcbc8efce1ecf660765cf350f72f08d580dde62",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html": [
-   "3c6c42b904b147695b80147fec78428901f23680",
+   "45f9cfbc85d5e071bd8427787de8ba5bb35aeaf6",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html": [
-   "df259116fda7366f21998aa717f50351be9ac24b",
+   "20b1362308b4fd13e341b204d30bd89ca27b2c5b",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html": [
-   "c0ae8b64bd06fe7427e4468d15dde5186b3e157c",
+   "99b9c46bce949b2f9a9b0a6c5ef770f80a04fd1d",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html": [
-   "3a4a73da09b968b5a7c46fc97fb778f49bafc825",
+   "26d31e7d02e119a00289d40a167947da3f814d55",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.keep-origin.http.html": [
-   "65d4d275b117fb0534825b882ce227548c11dc4f",
+   "b898c979e966c615f344950223ad8bea9c391a4f",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.no-redirect.http.html": [
-   "5b2e032f1cd659d75eff7dfe43c529b526faacb8",
+   "0f93a0d381d9941f7e0d86291adb38975adec0bf",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.swap-origin.http.html": [
-   "5aaf2f75b78a629c0a2683815c6d85a8ac9f19e3",
+   "5cd7090cf90ef3c3bb9d2952dd144de539aa2e32",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.keep-origin.http.html": [
-   "27058b1fb6206cdf1340e2d8b2b40a198569dfd9",
+   "c1673ccd9312f2700777a95682d7f0614b296e08",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.no-redirect.http.html": [
-   "6eb54403f3cccb4653b2e841ad1a9d940d214fec",
+   "c7ef7f1ec78aed5a627fd0f6acb5e435c1234a32",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.swap-origin.http.html": [
-   "d23a00666e75f0c45fbe0cca695b48f05623376c",
+   "b67bf41743f5db56614421906cebf1d959ec57fe",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.keep-origin.http.html": [
-   "cbd4999e4024ecc3ec88b0fd6a67089ec6f270cd",
+   "c3f6792d6a4a2d6ca8912c83eedf34bcb607960d",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.no-redirect.http.html": [
-   "271183fcb4ebc797e8dfedb24327a2dc0d02bf5f",
+   "491f6b3cb5261e517aae233aae8c84cdae614399",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.swap-origin.http.html": [
-   "ac2723008ce3a747524a91887dd596b24c6242cd",
+   "df34928f99387040b094ccb4ecf5132fec0d577a",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.keep-origin.http.html": [
-   "a388de9a4ca5632d75a41e1bc202c7afef6c0b5b",
+   "8bed4ad1bb2affc29142663926c0693d173ce219",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.no-redirect.http.html": [
-   "ba5cba7294d82943ea9561fb657e841cd3efba5d",
+   "f3d1691d6c152dafd0f9459dc2dd9c03c6f96de8",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.swap-origin.http.html": [
-   "61c17e055278e0ff7a5c329bb60d826aa8cf5bb6",
+   "538334723522e3a705b6e126b7f35fb9742a248a",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html": [
-   "42ad5ee0a386b9d6786d1962dd58d724b34682ee",
+   "949ed772ff54f7591d9d0f3ef5a8bea0e98dbb12",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html": [
-   "30af7d2f956297935a7634c924fa4802c20d3c31",
+   "8782ec3a348d8902838fed9c02b5bf0310484c68",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html": [
-   "ceb66ae165cc39ad702ff2e219f1b8db6efa4ee2",
+   "42971f4747787a4ac91c7720a0ec41488e05a92c",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html": [
-   "b9ac57bd605b1d076304b5a5c0b29c8963f11470",
+   "86ace00858d91b01da09b5f58207b259793943ac",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html": [
-   "94b29642faaed82861b235c1437f04e5e9610afe",
+   "c719ed4e40edcd1dfa7e8520e8c4c5448b17e0f3",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html": [
-   "9ae52af191891cf8c09fcf01342c68732b195ec0",
+   "95d876e75c537331475b1429169f4a3ebec0bc41",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.keep-origin.http.html": [
-   "80d2ef3d637d15eabd3e4aeae9631b2a7e81d93c",
+   "64f671f5b5256c81a458ada62bc90fe48d911426",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.no-redirect.http.html": [
-   "54b16bd2f2eac3e8db05566f4595ce0a7e4d26eb",
+   "154a3be99a4fa448054c0c77b5610c3e7247250f",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.swap-origin.http.html": [
-   "d1a1d0f94f1ea2a772f95ac592028c8194157267",
+   "5c0c60396432a3d3f7cdebb3451985e0d1dbe314",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.keep-origin.http.html": [
-   "4c39915851cf4859fbf8ea6ac492fcc628b4d761",
+   "b9b13627877db8877d16eb9a5278ffb4b32b9eb6",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.no-redirect.http.html": [
-   "a577b04536ddde1ae73fd7538de45f0665e356ed",
+   "c346912a14584c2eefa43593873804ab4de928fc",
    "testharness"
   ],
   "referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.swap-origin.http.html": [
-   "cae58dc05836b17fcd8182b7aaab4da9b04c56ab",
+   "e634871612c91ede938dad5ab2fbb78a456d178e",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html": [
-   "18f5f7e78364df6e306de16ba02697e6a7bac03b",
+   "6c9682c6b2484f012ed8e5436390c197bc7e013d",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html.headers": [
@@ -692962,7 +692793,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html": [
-   "7608b8dd81dfb4cf88d571f1428dbe59e1c32733",
+   "979a6c859db0261525c70141733be72e59080e1e",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html.headers": [
@@ -692970,7 +692801,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html": [
-   "e61405026d57b17410976d3441445f8d7f86912a",
+   "55d837ef0f0b0e302d82bd930159c656db7a5746",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html.headers": [
@@ -692978,7 +692809,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html": [
-   "227bfb014ab007075a80637c882a6c875642dc3b",
+   "53b50b0efb4dee17e4f2255e8276a0f97be6da0b",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html.headers": [
@@ -692986,7 +692817,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html": [
-   "b103557d52fbbc249f3a9c46eceedab7a593b042",
+   "ade9ba3304c763d2df6457d3ed2a0adaa6e09b67",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html.headers": [
@@ -692994,7 +692825,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html": [
-   "1945521974f7923d465257b99a5e40ce00b20692",
+   "c37a4614ef5225df7a4fc0249524a428c9eaa825",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html.headers": [
@@ -693002,7 +692833,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html": [
-   "794a5d82dc5ae76d16008fa6cff7fa0cff39bc9c",
+   "7935c4c0c88ceda962808d36cb97da5f0936e5ec",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html.headers": [
@@ -693010,7 +692841,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html": [
-   "5c04b74bfdbd461024e9098fa91d530f21969189",
+   "ed7e92b3c528d372a6f11d98ed4c853745217579",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html.headers": [
@@ -693018,7 +692849,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html": [
-   "2d6e05388ecbc3147353f7cafdd8b988cf0d15e4",
+   "495d9569e738a09592ff06ec6b1ab36b799cd5e9",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html.headers": [
@@ -693026,7 +692857,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html": [
-   "8374abffd934c31efda9fdc0a285fe2f908baf4b",
+   "bde07eb0c937e1284b938e603c0d7958f5cfd942",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html.headers": [
@@ -693034,7 +692865,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html": [
-   "faafb3759309ad54b751ba7de725a38795a73151",
+   "71e1b673a58f68ea9f19bfda2859e7aa99987ac9",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html.headers": [
@@ -693042,7 +692873,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html": [
-   "00cd1c9a4c723799e03b25a90eaef5a0fb72ed2b",
+   "d2222b6feaf7119ca8aec9d5a4ca57e8439c247c",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html.headers": [
@@ -693050,7 +692881,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html": [
-   "34abf8e3166a98b7cc20f17bbafb2f0bfe3c856a",
+   "30af1009de8a8172b8abc4d335a7be1bf7178d63",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html.headers": [
@@ -693058,7 +692889,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html": [
-   "540695000e925bfd3cf50b021a230cf1478e63b6",
+   "fa8f2ae0cccba932f18a4a076d0b8a6c95b9341b",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html.headers": [
@@ -693066,7 +692897,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html": [
-   "91017dac64e41de0b6967d576d70b1f571813443",
+   "d3dcfababd61ce4fc7e428a28efddc027756b8d9",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html.headers": [
@@ -693074,7 +692905,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html": [
-   "69934afdbe58e538baefbaf665b1b31275c9d58e",
+   "ed11cb5b040ae039d2e59ad04b8f0203c97b48a2",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html.headers": [
@@ -693082,7 +692913,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html": [
-   "bc51d55ed10e4ad3232087c8e335847371cd11ec",
+   "6db93695c79d1b104a52c082c7c6f86b56e61088",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html.headers": [
@@ -693090,7 +692921,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html": [
-   "6ae3dfe0df2e7e54b528000b3f61a481da3df75e",
+   "4e77af213712bbeffac62ecbfd449bc22cb0152e",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html.headers": [
@@ -693098,7 +692929,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html": [
-   "310a25c9d7a3b5193a303c068376014577f90d02",
+   "8cbbf1cfc7e0d6cbc300bb7f51f6a5dfcc8d6529",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html.headers": [
@@ -693106,7 +692937,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html": [
-   "c6e652dbfb831aa6d50efe111cf3e19f4f532a06",
+   "eb3623f74b1aca67fac9df22ba25a995b5a72ee8",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html.headers": [
@@ -693114,7 +692945,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html": [
-   "13002bc2f2bac9ea40b8bfd4729f7758f0604081",
+   "b812f085f0eb46e0bc28805a8ec1e91529e66030",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html.headers": [
@@ -693122,7 +692953,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html": [
-   "0333192ce9e2b78f7e0edd76fa1aec1e07ce8b3e",
+   "9c5133009af66b9cdb224c02457f5bf53e37de4e",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html.headers": [
@@ -693130,7 +692961,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html": [
-   "411bd2378ad8944841122a89262f8f11cd34d5cc",
+   "f74bbac811db5cec4dde456f3f2eba7f05ffc2a6",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html.headers": [
@@ -693138,7 +692969,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html": [
-   "ab458a3fdc055f710841de6a2bccd9fb0fe59f5d",
+   "86b2560b7d6b2e935ccc822a162881f6474ce1e8",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html.headers": [
@@ -693146,7 +692977,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html": [
-   "3d7a405eeb1dc5ea5d350a01e7d63a0ebebffef3",
+   "c788359120fd3b4bf34a0b4a39bda40ca696bb33",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html.headers": [
@@ -693154,7 +692985,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html": [
-   "439e0ad2f3ae12852aa47ae66ea464efd6cbff44",
+   "ff16c2bbc22e773b55563084a736f93d95b467ee",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html.headers": [
@@ -693162,7 +692993,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html": [
-   "d3a5b39ca80ce4d989ffce205be87b410c131d65",
+   "15fb9b2a4d660c2c0b5497bce3488dee77fdd6ce",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html.headers": [
@@ -693170,7 +693001,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html": [
-   "01ea8d525a3ae04db9d40604034933298d9f9f6d",
+   "c10fff1aac437d02d29f8c0467678703a8575de0",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html.headers": [
@@ -693178,7 +693009,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html": [
-   "f172633825118e6ce297acbf9f228b65b2967476",
+   "71ab849c76b7f97eaf0f2720f0a1e42926c8471d",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html.headers": [
@@ -693186,7 +693017,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html": [
-   "9c2ba561f6979837bb666e86c00c9c71fd43d2c1",
+   "ddf34a6b7bb23ca35baa9dd1365990b2e1440491",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html.headers": [
@@ -693194,7 +693025,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html": [
-   "681e67532c250c508f54ae9081a520336b9bb0f9",
+   "2b143328b4bc4546eff85f6e34c95f67d455280b",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html.headers": [
@@ -693202,7 +693033,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html": [
-   "399bb9ea0fc689e4be30676fe2d5a11df427f1b4",
+   "2bfbc263018a1881e07bb8174a893169fd4a2446",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html.headers": [
@@ -693210,7 +693041,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html": [
-   "65826f7c85d55c200aaf20e04c57f7adf4387fd6",
+   "aa96e23a25d6414da8ded37b88eb75a55008a2d4",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html.headers": [
@@ -693218,7 +693049,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html": [
-   "73efdb753328ba2b67fe573903254c6a995e29d5",
+   "bce09ce6866183b28e854967bf43b9a12b8518ab",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html.headers": [
@@ -693226,7 +693057,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html": [
-   "761a7e349ea4a6bf71d5e24f35d5de2dde15277b",
+   "fe82a2f859aa55a2c1e0f118657ad53edc8a6815",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html.headers": [
@@ -693234,7 +693065,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html": [
-   "55309a1d31e5c7d68647b0c3ed94a9267d85baa7",
+   "527f27da5c5156cd695128981b80c3e441c8ed8f",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html.headers": [
@@ -693242,7 +693073,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html": [
-   "228985630e405a791755f8b605fbaf7bc8ffc3c9",
+   "2af8f5538f88eb07550eff9b6400dc743f765469",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html.headers": [
@@ -693250,7 +693081,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html": [
-   "d87b9ac71a698906e05cd2a151587a12e2a417a5",
+   "f18c37f4d434f0abedd406be3c16e040b73a504b",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html.headers": [
@@ -693258,7 +693089,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html": [
-   "be33a5498be1b31fc28370b97e8a0e58411b6bd6",
+   "c92703d274f1f313497967eb1af26c4f0f2e9f1d",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html.headers": [
@@ -693266,7 +693097,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html": [
-   "52750a374b1db819806ab1736a38acd84d78e836",
+   "51464011540cece8828e20d748affe76f5b72fa3",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html.headers": [
@@ -693274,7 +693105,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html": [
-   "643a7809abea97b5dffc0a26ab21f730681e4a01",
+   "bfbb2ff96fcb81ef8461599f4970a210758fc2ca",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html.headers": [
@@ -693282,7 +693113,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html": [
-   "b8c3ca8405ca7f78a0b9d1e50a6b132400772767",
+   "460116ebce93b049e7d8157726163a111807d426",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html.headers": [
@@ -693290,7 +693121,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html": [
-   "f9c6b33cdb837b2ef25e847ab14e345c6ff80a54",
+   "4ebfa352e041631d8e75727162ac00d8d094b8ff",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html.headers": [
@@ -693298,7 +693129,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html": [
-   "1d2de6d2a13c016efaf412c717d4c64231ae8b49",
+   "4f9b358e3942f3e4899a9f0000053344f10f28e6",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html.headers": [
@@ -693306,7 +693137,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html": [
-   "31328d457407451c43af427ce8f89a7a3c280376",
+   "f0ac944aceb70a3e3cef12533a701e18b16b93fe",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html.headers": [
@@ -693314,7 +693145,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html": [
-   "717cd564712ff8dc4db75dfa543f35adafca04b5",
+   "556ccd4c23678667ec0eacfbfa8959a701c90309",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html.headers": [
@@ -693322,7 +693153,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html": [
-   "93aeb304aa094aceed695887d144d4159de2015e",
+   "103678ca070c9115bdd725b1f40dab42d3b9eac9",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html.headers": [
@@ -693330,7 +693161,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html": [
-   "32dcbabd9563dc7df5abef0ddb257245772491d8",
+   "3e68258c56bfdb621193ebf5aae7e672a588a02e",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html.headers": [
@@ -693338,7 +693169,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html": [
-   "9c0f9300cb416a9bbfcbe49d38a9ed0de7e9ede6",
+   "b2382583a1cd3ec8f4da8a9e85b3ce8f0fc08157",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html.headers": [
@@ -693346,7 +693177,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html": [
-   "d0d99bf8db59f3b19145ee640f53ad18e8ec45f2",
+   "b0d57326991e1e9ff25ab67a522c5aed5c981864",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html.headers": [
@@ -693354,7 +693185,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html": [
-   "489607530db690b1e6f7eafbb837aa315ea87377",
+   "5bffedaa3afbed4962942d853200c774a38d954b",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html.headers": [
@@ -693362,7 +693193,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html": [
-   "8d7c2e4e116f746793f2ce9bc1c31b3ea29cc175",
+   "9df184c35f8dd6fd13c8555952ac0ba809a6ca40",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html.headers": [
@@ -693370,7 +693201,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html": [
-   "0947e01737a117afb785793853376def3ce20913",
+   "17d44359222f17df03e28924792f77536f82f325",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html.headers": [
@@ -693378,7 +693209,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html": [
-   "0f27e978db872c570ae5b0f6565ea749028c265a",
+   "1138d88ebd284c0713d9e3ce5cd234d9561177d4",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html.headers": [
@@ -693386,7 +693217,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html": [
-   "88217e8b3f09b681e6023443e2f650ea2965d110",
+   "a6f8057809dbf1abbc6bf76b6bf920e3de8f52ff",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html.headers": [
@@ -693394,7 +693225,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html": [
-   "4371c15add6120b805593500023c95c95672e5dc",
+   "9f523e3123a6a23fd73a10f3ba152a1704ddf148",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html.headers": [
@@ -693402,7 +693233,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html": [
-   "bcd98e69823a18eb7a1709008ceb3b7ad708e6b4",
+   "4c831d17355f6f6028ab28fa4d3171890b1547b3",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html.headers": [
@@ -693410,7 +693241,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html": [
-   "200d64bbb6bb5a2379db13683e489460a18a4f39",
+   "0778be7183ade09962ffce10500c5871f5108b17",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html.headers": [
@@ -693418,7 +693249,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html": [
-   "a83a492fdf7d76a08386ec5c6bd65fd65fa0a8fa",
+   "30eaf1a707d254dbb84c3f85d157b42931eafbc8",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html.headers": [
@@ -693426,7 +693257,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html": [
-   "55a055025901be50db54c48930daad9769ff169b",
+   "b7a5de235c515f28b03b6899687854a977493e72",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html.headers": [
@@ -693434,7 +693265,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html": [
-   "d07af49677e9d0eed7c30204967239721d6469fa",
+   "1ce5a65db107fb6d74b9ec3e022599d25891afed",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html.headers": [
@@ -693442,7 +693273,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html": [
-   "bb681309a8115b3e3181f0027728e2e2d5e1da96",
+   "0022023089d35fbdd8668bb142386a5663b322e0",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html.headers": [
@@ -693450,7 +693281,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html": [
-   "f493ba675f09d44880374edc7218a9124ab6b5a8",
+   "6cd8c6738e9a591e9bbf07adf556d25c50b8303e",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html.headers": [
@@ -693458,7 +693289,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html": [
-   "c0c3284332acca9cbc098cfd73ad309e96f8ab34",
+   "504db6741b35044e1850f23d0d1a2fcb6efdcde4",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html.headers": [
@@ -693466,7 +693297,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html": [
-   "8b1519a47b3ad42cd0e7ee9ebb43757775ad3002",
+   "f8ba7575e2b0715b4127c2d55caac5dc99d06eee",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html.headers": [
@@ -693474,7 +693305,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html": [
-   "7fc6be9d0a7558c1bc95a684eb17e57dbaca02b7",
+   "9d01a07ef34841cb29c0a3286e6bea1046e4dd15",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html.headers": [
@@ -693482,7 +693313,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html": [
-   "d00ccc947a3b7ea74a4b68b2b96f1c6fc36a9a6e",
+   "6d36dc316f419e3d406f0ed0f76e7359431b7bdb",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html.headers": [
@@ -693490,7 +693321,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html": [
-   "285b3eab42ee3f223e8cc6453cbad6bc338522c3",
+   "950a580fe73540f6f5802612133cf7cc7c0b11b8",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html.headers": [
@@ -693498,7 +693329,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html": [
-   "d6f5fd26091db6cb7571c30864d57219be653c99",
+   "2e9ede068bc7921106aaed371629a88daab18b1b",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html.headers": [
@@ -693506,7 +693337,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html": [
-   "e7d9c7685cba8520c4c21c227fd2ecbe11afbe61",
+   "7eaf8ce04d20e4f9c5ccadef9c2de4e4cde52095",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html.headers": [
@@ -693514,7 +693345,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/a-tag/cross-http.no-redirect.http.html": [
-   "3c3e39e79710d5ec6419d5af3f7663c692a7b7be",
+   "1e9ee507e11a9c567e1e5fc069be0e0f61e8eb99",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/a-tag/cross-http.no-redirect.http.html.headers": [
@@ -693522,7 +693353,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/a-tag/cross-https.no-redirect.http.html": [
-   "20a4881d258a2efdfceb565c8bbfd453c1c05d2b",
+   "4a06e8400b83a93b0c0d9624b22f36fb0bcfbd01",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/a-tag/cross-https.no-redirect.http.html.headers": [
@@ -693530,7 +693361,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/a-tag/same-http.no-redirect.http.html": [
-   "c45b1f4c7a3c481a670f1f613945bd650e0b752d",
+   "6b04a7e8cadd72a412013a856df7d88da85d25a1",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/a-tag/same-http.no-redirect.http.html.headers": [
@@ -693538,7 +693369,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/a-tag/same-https.no-redirect.http.html": [
-   "0a34f109e159586b033d80505971061f3d499f40",
+   "6e8c27b09faef2a7ff818bad9e18efb74d318360",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/a-tag/same-https.no-redirect.http.html.headers": [
@@ -693546,7 +693377,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.keep-origin.http.html": [
-   "1662580623a0b41f8cd135c85957b94ee444de63",
+   "16d2d07132c684792e0f7ffd9fafc58fb85f6eda",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.keep-origin.http.html.headers": [
@@ -693554,7 +693385,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.no-redirect.http.html": [
-   "b05452f5f5ab8b41d8a6f8076f172d774d098d4b",
+   "eb37f1326365345ad16243ef00e5ffe6b2769b25",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.no-redirect.http.html.headers": [
@@ -693562,7 +693393,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.swap-origin.http.html": [
-   "cfd7990f1f5cd65b697f12960f5200706111dcf0",
+   "94bdab2ab22d9e7409d53aff904f950615cf89cd",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.swap-origin.http.html.headers": [
@@ -693570,7 +693401,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.keep-origin.http.html": [
-   "fa89fe78b6811144288a55f46b25f03c52ece17a",
+   "9693fbad391de5d083e54ce3fe3ac8c4e37d8000",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.keep-origin.http.html.headers": [
@@ -693578,7 +693409,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.no-redirect.http.html": [
-   "8d5e2b0776a349685b7d4b9cee4462efc94d424f",
+   "70665d2bb08765315bb2af14b659536dcdad9fa4",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.no-redirect.http.html.headers": [
@@ -693586,7 +693417,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.swap-origin.http.html": [
-   "cf2e2054acd7e557586347b4b922ad08922714a5",
+   "e932d32a89d3d579454905e322c87773031f3ef8",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.swap-origin.http.html.headers": [
@@ -693594,7 +693425,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.keep-origin.http.html": [
-   "59ec4797c2e509b470911f8bb2a8c3fead5f815a",
+   "97f68e0858af0dafb308937d6949fba4f9e47148",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.keep-origin.http.html.headers": [
@@ -693602,7 +693433,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.no-redirect.http.html": [
-   "f883d367e7fe57bf03a626d35667490193d8a438",
+   "4524c2db38570906a7fc62d9c382a1e0b0e9d705",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.no-redirect.http.html.headers": [
@@ -693610,7 +693441,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.swap-origin.http.html": [
-   "fa64998f81f8802ccdf518a2074e96c54391938b",
+   "1e685b2293123a7dc124ca9c6b7c9cff46c06317",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.swap-origin.http.html.headers": [
@@ -693618,7 +693449,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.keep-origin.http.html": [
-   "5eb42a75a5c45bbea47132117dec7e6d8081d69d",
+   "41a1ac3178699e8ce23c9212ee1a46503d97d63b",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.keep-origin.http.html.headers": [
@@ -693626,7 +693457,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.no-redirect.http.html": [
-   "80c44e16cd5d48f1048d3985212f051a2263d69b",
+   "7358d86b643c2dc771cbdca9506b67f9bf29bc00",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.no-redirect.http.html.headers": [
@@ -693634,7 +693465,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.swap-origin.http.html": [
-   "8bf62ba6310381d81d689d759f71f67b657c7f41",
+   "7e1c06d3b12c1e7d0f2e931166fac9387e3cba8b",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.swap-origin.http.html.headers": [
@@ -693642,7 +693473,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.keep-origin.http.html": [
-   "a11fb4309272c4c018a049c805a2c7f38618a1c2",
+   "0d40b8c774140aeaa30d99d8e35ecbd3fcb9a822",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.keep-origin.http.html.headers": [
@@ -693650,7 +693481,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.no-redirect.http.html": [
-   "4ed4f0ed555b2e084cae07644279bdcb4f075cd1",
+   "99176391e206e0c14c7df92cb45ea9e671f2e379",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.no-redirect.http.html.headers": [
@@ -693658,7 +693489,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.swap-origin.http.html": [
-   "66270486980dd2baefb7e4a038113291ecb8a366",
+   "3b2746d4c3587556efe4472d3dff38ae4ba5da6a",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.swap-origin.http.html.headers": [
@@ -693666,7 +693497,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.keep-origin.http.html": [
-   "0e1f69de7d89a18b4dfcdef551aecec4f8b6f836",
+   "059a2d6756578975f231b5470fe53075b854be53",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.keep-origin.http.html.headers": [
@@ -693674,7 +693505,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.no-redirect.http.html": [
-   "1d4a266b9008efe4391a0d9ddea8774f7037385d",
+   "d43ae0a4ea76cdae732840a4b3ec041e0f245d4a",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.no-redirect.http.html.headers": [
@@ -693682,7 +693513,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.swap-origin.http.html": [
-   "37af269c833e3475544481fbb930e445408dee02",
+   "9692f56e25ca32c3190f33c0cddb623a196882b3",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.swap-origin.http.html.headers": [
@@ -693690,7 +693521,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.keep-origin.http.html": [
-   "ee600f00764c25d5d3d3dd92a9ae4a865cf185bb",
+   "c2e55e279c10b07739e5f3c60206e8c1ae71e040",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.keep-origin.http.html.headers": [
@@ -693698,7 +693529,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.no-redirect.http.html": [
-   "c14440818446770c2cb1f80e1dde2ec264983ea1",
+   "78774cff2b9464a01a2b3a972d68d6878c99ad05",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.no-redirect.http.html.headers": [
@@ -693706,7 +693537,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.swap-origin.http.html": [
-   "78d874cd7b4caa18c1bdcebdf3af99e1f2ec6487",
+   "08b0ac93aea84fe2c829cb1197928e73198c83dd",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.swap-origin.http.html.headers": [
@@ -693714,7 +693545,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.keep-origin.http.html": [
-   "05d58994cdb4ed44c674fcf7fc80e62ae4969f09",
+   "cb32702f78493c604db2b5ecbd3b3fba679a0d44",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.keep-origin.http.html.headers": [
@@ -693722,7 +693553,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.no-redirect.http.html": [
-   "180b42ddf552c33da7cdde5e7c048c06099dc9b1",
+   "2838cd9bcd0ca9a101fbffcb89b03ef67265955c",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.no-redirect.http.html.headers": [
@@ -693730,7 +693561,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.swap-origin.http.html": [
-   "8efb1f5871be4839dea5f45e1fa65774facb9a22",
+   "354dd98840e8642effed7a6db7997dc85702aa2d",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.swap-origin.http.html.headers": [
@@ -693738,7 +693569,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html": [
-   "112b9268f431394b8617a1ee482aaa9801e5b32f",
+   "18bad3a68da62f7847c474ec55a5cea576c9052e",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html.headers": [
@@ -693746,7 +693577,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html": [
-   "de4676d67cdc3794c676eb49ca9f8efe78bbd0f4",
+   "89260d61d108acbdbad8ee28d485a7fc01636c38",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html.headers": [
@@ -693754,7 +693585,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html": [
-   "4ee121ff97c701a7043611c2c7208d7749449d0a",
+   "67abaa5dff91004787da80588ee72ebcc07db531",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html.headers": [
@@ -693762,7 +693593,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html": [
-   "025968b66e391b58ffbbef3ea558174cc9e29bdc",
+   "ffd380ac39c3a099a11873639ae8fc162a290551",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html.headers": [
@@ -693770,7 +693601,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html": [
-   "54a0de2c93ba0c27cd469f8afd0d06d2f7bcba99",
+   "df378f645f634c542d24540be64479a8aa6b3215",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html.headers": [
@@ -693778,7 +693609,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html": [
-   "b155363e0584298bc48cd6b13c88d83f84169518",
+   "5b6b84d9100cf1b7202646bb3fc55097807fa807",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html.headers": [
@@ -693786,7 +693617,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html": [
-   "7fea42178ce0babb331bf4ccb0a02c9e8e077fbf",
+   "244d330474d0a9d924d67205d98b1133c69fb59d",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html.headers": [
@@ -693794,7 +693625,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html": [
-   "2401b8f330bcf6c72853b4ebc7d93165c5543ca0",
+   "56a2eb97e0f6eba3826619c5e6ea3b91dc5a86a7",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html.headers": [
@@ -693802,7 +693633,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html": [
-   "fa53b0b436a75a7ad70ca40d50abca45fb6bf3ee",
+   "85bdbc7409a26c7e84cc8c7bdbf724bb6c3c4a34",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html.headers": [
@@ -693810,7 +693641,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html": [
-   "ec819af693132e233949090f67d36097f16e7a12",
+   "8e0f8da23944a90f5341b9313e7cf10aab3e44c8",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html.headers": [
@@ -693818,7 +693649,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html": [
-   "4aceaac58f97a7d727170903e5e28f6497e2a899",
+   "3107f0de8a7ae569d598c0ca0033525c6555fd42",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html.headers": [
@@ -693826,7 +693657,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html": [
-   "cd8fbfe9098abac4a517ab538e754809852810e9",
+   "f106363aa73f980f099f0afeac0d33d2a362b5cb",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html.headers": [
@@ -693834,7 +693665,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.keep-origin.http.html": [
-   "68f9e48740ecd28658445c36b0ec68b85bff4c4a",
+   "be1caba6b6d9ea3f94e1556a379b32f253c23456",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.keep-origin.http.html.headers": [
@@ -693842,7 +693673,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.no-redirect.http.html": [
-   "e50c977d248029702e994bfaba1540eec7330ec4",
+   "7a0acfad933dcb6a3e8a275b8a1e009e3701a524",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.no-redirect.http.html.headers": [
@@ -693850,7 +693681,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.swap-origin.http.html": [
-   "fb2648dd4b7d174d74af6459023cb2a44af4c8e1",
+   "3493b25ccc1afd43fdb042f4171d8e71f57008c4",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.swap-origin.http.html.headers": [
@@ -693858,7 +693689,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.keep-origin.http.html": [
-   "18eb49cfbb0703d86d285029524a466ddd270fa7",
+   "631371477feec6a14af58f520e0f5f65a75dab90",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.keep-origin.http.html.headers": [
@@ -693866,7 +693697,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.no-redirect.http.html": [
-   "a0843338a23fd425c7157cca53e62598490b8be0",
+   "8a09a0a99e295b0452ff8c72f5b5c7be63940faf",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.no-redirect.http.html.headers": [
@@ -693874,7 +693705,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.swap-origin.http.html": [
-   "346a5e64f1f337c5520e145d08567e6fa2afcb5d",
+   "62dc281f9e75aba4fed78ee354afe5bd74a5ad2c",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.swap-origin.http.html.headers": [
@@ -693882,7 +693713,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.keep-origin.http.html": [
-   "bd3d2fa8e1b61e446d7f8af024f7589cd58b31d5",
+   "76fea0461780213a36dc4d628edbab73cc7e2d3e",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.keep-origin.http.html.headers": [
@@ -693890,7 +693721,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.no-redirect.http.html": [
-   "9ba377679514642c1ebf631f9c6f48b71fa18a6d",
+   "bc909a690d1c90d6c1c39e8291060344f9557bf8",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.no-redirect.http.html.headers": [
@@ -693898,7 +693729,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.swap-origin.http.html": [
-   "1c874e8f24910af5e172675b4af38775492ec315",
+   "fd9d14b3c77d7733c25b539ac1de10a91375299d",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.swap-origin.http.html.headers": [
@@ -693906,7 +693737,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.keep-origin.http.html": [
-   "baef78cb21e17f21b12668d52cbd40f64b238c15",
+   "abc4c33ec5a37771b47578f3b205a653a3543b25",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.keep-origin.http.html.headers": [
@@ -693914,7 +693745,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.no-redirect.http.html": [
-   "51c81ff6fa00072070224a4306270f32d8f71c4e",
+   "7fd5d2a88fe466a2f8ba68cea31408abd18e29d3",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.no-redirect.http.html.headers": [
@@ -693922,7 +693753,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.swap-origin.http.html": [
-   "f2c03ebcd99a295aab2fd145db5a7b2d1094dc6c",
+   "15c9a665d71911b388dcccd35e76c9cc07809054",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.swap-origin.http.html.headers": [
@@ -693930,7 +693761,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.keep-origin.http.html": [
-   "f1a249f24384c32a48e7964418cdfaba71b3d1ce",
+   "ddb27f9b19798c8d6816797d6d42b63acf2c94f1",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.keep-origin.http.html.headers": [
@@ -693938,7 +693769,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.no-redirect.http.html": [
-   "1f836c6f2c0c05ce8f3f3aa8fc857c754a03fbf1",
+   "f85e49053ad3389c87a0f2baa72e31a86121f650",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.no-redirect.http.html.headers": [
@@ -693946,7 +693777,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.keep-origin.http.html": [
-   "1158bc7e5e541e432aa4523a7d552c3ee569082d",
+   "95b183366aeac9b40c4142859cf32de28d56acf5",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.keep-origin.http.html.headers": [
@@ -693954,7 +693785,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.no-redirect.http.html": [
-   "de67fa3aa8bc5f8c620f40fdcd3da173d2606604",
+   "6f7bcbfafb9bcc6967a5532a003cc912570d5374",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.no-redirect.http.html.headers": [
@@ -693962,7 +693793,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.keep-origin.http.html": [
-   "b6656c669a72164fb9a2f206d319faf73842ed01",
+   "143c9fc5111dfb63df7b7011e08f36dee7111777",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.keep-origin.http.html.headers": [
@@ -693970,7 +693801,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.no-redirect.http.html": [
-   "552e926e44c49a336fb42bb2d3be3dfd24f7d4ca",
+   "ba4d39931d7fffa96415f934a75b38aef62b0916",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.no-redirect.http.html.headers": [
@@ -693978,7 +693809,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.keep-origin.http.html": [
-   "c77a423b3cbc86cfd32a98f86040725f200d496c",
+   "086414ccc48f6b983a73691ec50a428b63eb7e51",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.keep-origin.http.html.headers": [
@@ -693986,7 +693817,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.no-redirect.http.html": [
-   "3cf0e572297c3532342077e02dd841f32546c674",
+   "5d7ad100bcdfab652e0dcf957dc94fc5e73ae6b1",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.no-redirect.http.html.headers": [
@@ -693994,7 +693825,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.swap-origin.http.html": [
-   "7a82b1abf34650b1b85331251dea0eb8807b34f2",
+   "30f2b3953d7de29a624f664474621599beed93e6",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.swap-origin.http.html.headers": [
@@ -694002,7 +693833,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.keep-origin.http.html": [
-   "41170c6e4ae9d7ae3ac57bc4588e6c94252f0f99",
+   "47b798d7dd765d13fe4fbd4ba67c9323ec0c6dfc",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.keep-origin.http.html.headers": [
@@ -694010,7 +693841,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.no-redirect.http.html": [
-   "220ff8170947d798a3f32af44d50e2a6dd028b76",
+   "d5a55105add54d342c22f1c1f136af73cc3f7e06",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.no-redirect.http.html.headers": [
@@ -694018,7 +693849,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.swap-origin.http.html": [
-   "3ea97ac350272997d3a0d8f36fc895992c7c2bf0",
+   "176dc4852f713590fe767a69b5c0262266466c8e",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.swap-origin.http.html.headers": [
@@ -694026,7 +693857,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.keep-origin.http.html": [
-   "28f38a4a700beecfc7711ef9ace273dea16fec7d",
+   "3f51d82eddee1205370a0f6e803b390a9d1f371d",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.keep-origin.http.html.headers": [
@@ -694034,7 +693865,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.no-redirect.http.html": [
-   "6e8631db1202a695fba12a3c946dae25d518fcfb",
+   "95684dd25477aa9891bc20b0f0f225f883d2fb02",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.no-redirect.http.html.headers": [
@@ -694042,7 +693873,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.swap-origin.http.html": [
-   "af6dc67f3ff90287d2de2db24d8e545f748155ea",
+   "b1de49c4c061f0314d74e77743f3beac3ec9a06a",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.swap-origin.http.html.headers": [
@@ -694050,7 +693881,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.keep-origin.http.html": [
-   "51a52d09cd1cf34c79b1d0b4722a2b34335365ce",
+   "9228bb6af2df1ccc841b4d44754ca0c2d42ffb61",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.keep-origin.http.html.headers": [
@@ -694058,7 +693889,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.no-redirect.http.html": [
-   "6bf08797e016e83a50747044a00d3c68b86b4ff8",
+   "96bc099560df999487385ee81615ad240192dd7a",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.no-redirect.http.html.headers": [
@@ -694066,7 +693897,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.swap-origin.http.html": [
-   "1f0626a09d99df8bd7141a8fcba3a4656d6c5d38",
+   "f25d5fb9af03081aa61af56e7fad90e5746ef8fb",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.swap-origin.http.html.headers": [
@@ -694074,7 +693905,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html": [
-   "e332d57ae86a8fa3683eced1a3dd89f7058ffcc0",
+   "fab257dd738b95c67fab0ffeb1efe2598ba6538d",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html.headers": [
@@ -694082,7 +693913,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html": [
-   "790d5f73714b89d9dba5854317c381111496e54d",
+   "bafedcf3fd6a6f523e68bc42c951f1a7315a3689",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html.headers": [
@@ -694090,7 +693921,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html": [
-   "dd506fcc066f87a95c7756cbb79270598e011978",
+   "d8ef3354aef88c325c2b238544e52d5c632c21d0",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html.headers": [
@@ -694098,7 +693929,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html": [
-   "7b5468e47bdd9f2bb5941216b1f02e72543ca7ca",
+   "0c25521be74eed0617e2c35347dceea515969438",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html.headers": [
@@ -694106,7 +693937,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html": [
-   "c58cb7c4b548f252c60ffb52baa53997a5a1eecb",
+   "c6dea13384d6020d2111a2fdf825d62dbb962225",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html.headers": [
@@ -694114,7 +693945,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html": [
-   "3d5df31d9433322f0ca2b3eca28d1a0d9d33a103",
+   "9be5c2e15a39a4d027ba56ec784cb46430f3927f",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html.headers": [
@@ -694122,7 +693953,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html": [
-   "e694f13dfe035bdf35e4ee53874f06e9b440ca10",
+   "4f797b6d4be050c81fc9d4353311b072fd73a40a",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html.headers": [
@@ -694130,7 +693961,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html": [
-   "0cbc3be83a2493427ecc988547e925a0073d6d47",
+   "245b5ecf8602a2fe7a10c9af1923755941403cf5",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html.headers": [
@@ -694138,7 +693969,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html": [
-   "12b6a96104ca903dece23b95fa3f689180ecb69e",
+   "ff54b29fe69ecfbe1b713cdf7dca429697dd906f",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html.headers": [
@@ -694146,7 +693977,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html": [
-   "e528b97d5f1675f28bd9787a031e99c80be24e63",
+   "1eb441d07eb0979cfe73934787c5374fe54f0932",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html.headers": [
@@ -694154,7 +693985,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.keep-origin.http.html": [
-   "350d7cf796a1f2a4837e3007635f8087dff5d562",
+   "010d99253f7a0c129de8f92251a327a0354661d2",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.keep-origin.http.html.headers": [
@@ -694162,7 +693993,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.no-redirect.http.html": [
-   "850a8e81232d913198f8a78d44a8664b5574cfb4",
+   "cada33d19f424f5fb3f3faff23c51afda1dc54ad",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.no-redirect.http.html.headers": [
@@ -694170,7 +694001,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.swap-origin.http.html": [
-   "d222bd295df903d3d713bbb105bf3b689ee6cb97",
+   "8a8151fbc2c385fc99c2816a5f80b0de805504dd",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.swap-origin.http.html.headers": [
@@ -694178,7 +694009,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.keep-origin.http.html": [
-   "694a57d412ec2dcf1bd123d4507fe6e62ae9e0df",
+   "fab78eb6062ba510e43dfe4eb8745e6af11615a8",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.keep-origin.http.html.headers": [
@@ -694186,7 +694017,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.no-redirect.http.html": [
-   "459cf30238e17e1f7ad68b08cd72ff72d97c2a77",
+   "43e3a20798397d2be96a99c1fcfe679f7a04ad4e",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.no-redirect.http.html.headers": [
@@ -694194,7 +694025,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.swap-origin.http.html": [
-   "1e951faba7b1d7ceaf07a021a6682989e8ac7f59",
+   "febb2ba21992c37e62ff43d4079f51ecb6ccc6e7",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.swap-origin.http.html.headers": [
@@ -694202,7 +694033,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html": [
-   "8ef8fd6b89483efe5216afc051e97fa60ea92f1b",
+   "9de1045c62e72610e63c1c7494100d0dde11af8a",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html.headers": [
@@ -694210,7 +694041,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html": [
-   "aa355566bb6097fe433dc4b43bf3b4f3c74a44d6",
+   "dd9a07848a01ee653bf81a66fabed277ee1fdae0",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html.headers": [
@@ -694218,7 +694049,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html": [
-   "4d789df9d53510597ea2c3dde0d32dd3d682d74a",
+   "19122f3b194c8fc0fafea74f1c92d58499ae008c",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html.headers": [
@@ -694226,7 +694057,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html": [
-   "acecfefe3b226812a7d31b5a1ff294057083c000",
+   "79c31cf3a767d9175e028485eb268fc908f63121",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html.headers": [
@@ -694234,7 +694065,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html": [
-   "ecef33210a6bcf27cb894cf991858af0282c72fc",
+   "48d694afec1ddfb590895166243dd6b6ba7d2501",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html.headers": [
@@ -694242,7 +694073,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html": [
-   "1de14dd530cab75b6a86d97e3977b20f2eefab99",
+   "b163b434fc96dac541d4ffeb039135c66aec328c",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html.headers": [
@@ -694250,7 +694081,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html": [
-   "5f94bbb6d1821868328e823584fcc6e0d3a2bf72",
+   "f668a45533fab3a548f7ae5f99a713cb307ea676",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html.headers": [
@@ -694258,7 +694089,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html": [
-   "6863810352d120227114dfa5ddc8830bdaa23a2c",
+   "0b2179a805bbc5e9fb9038aa3df828abe39bfaad",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html.headers": [
@@ -694266,7 +694097,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html": [
-   "cb5e36377bf4ebfb8cfee96be703ec8ac0981b65",
+   "b63b06151eabc5cc5cae1bc41c01ae4e68416f38",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html.headers": [
@@ -694274,7 +694105,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html": [
-   "e8a9ab43f198fc710994f5b9d1869dce21182616",
+   "c14a96273089f69096a4dd09a480b97a327f9782",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html.headers": [
@@ -694282,7 +694113,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html": [
-   "9f9813e75f81654cbb4407a406af2e715f46130b",
+   "0dcd4ceecf38c7d0233080c10feec08faf56e5de",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html.headers": [
@@ -694290,7 +694121,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html": [
-   "f4a8058f8d4d428cbf41886f36e2fde1fe9ab29e",
+   "39eb627d30090a14cb6acfd4deb12a0ebdcbdc98",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html.headers": [
@@ -694298,7 +694129,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html": [
-   "088b203f0844f691f607ac179f39e8bd90b7ad7f",
+   "743cc6aa09975aab23534ee4fae58265225b4e7f",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.headers": [
@@ -694306,7 +694137,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html": [
-   "c79f0b3be2a67640a50a2e4b63c6963ed7996695",
+   "cb35a2155ea4cb2a34dc0bc0773874f01df26fcd",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.headers": [
@@ -694314,7 +694145,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html": [
-   "d4e54c08a3b1e9cbe971f8e9ce7bd3291248ecc9",
+   "5a4e050859dee372ba32761bd9ec6e7ce8b18abf",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.headers": [
@@ -694322,7 +694153,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html": [
-   "ac4ca124bfd727133614edd526d131b82ee412b2",
+   "9bb8ac577357794a24beac5889de57c036fe50c6",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.headers": [
@@ -694330,7 +694161,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html": [
-   "66ab573165ea33b009b8730822046f1e93a074bb",
+   "62fc2a062b225dfe426380474b04604121ab9514",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.headers": [
@@ -694338,7 +694169,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html": [
-   "40d68fc5eab412a4512cef08d8bfd9afcfcaa631",
+   "35d0445ac46a786adb748beef958c4045a9dc3bf",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.headers": [
@@ -694346,7 +694177,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html": [
-   "f3a0351f66065216832b0a45c2c92fedeef9cee5",
+   "37be3a3d4de696c7f9b7cfe30f09f4f82b7c0ce1",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.headers": [
@@ -694354,7 +694185,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html": [
-   "8432eab8ff85596d8d591dd07784fb0f8d71f9d5",
+   "f6f53d3632a46d4d61fdae618130aef6e633c6ef",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.headers": [
@@ -694362,7 +694193,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html": [
-   "b5a678d0e0223e612db06e680776e2e77a0e8a43",
+   "6ed394c67d82d24a9d40a26e97e860ed5e7a6ef7",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.headers": [
@@ -694370,7 +694201,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html": [
-   "23558d8e06146c2dfd00f0239094e45de2194916",
+   "0f49938792db5a36842882d878827b488dcd25af",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.headers": [
@@ -694378,7 +694209,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html": [
-   "08b627f56efd54473659b17f94eeefd3025ef802",
+   "b0738fa17b6d69b207937f02dd8d0f80e133c268",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.headers": [
@@ -694386,7 +694217,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html": [
-   "cc5e6a344c6ce4a6d73c942cb2caf707884ed075",
+   "45e55fa37cd1f9c39834190add05b66a8bbc40c6",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.headers": [
@@ -694394,7 +694225,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html": [
-   "11581aacc0b4f420dbf726be748a169fd0b32c5b",
+   "3f318e0fd05ecc4d7ecc3cc385c8ff67d3b4329d",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html.headers": [
@@ -694402,7 +694233,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html": [
-   "0aaf48c10102cdf41c5d1ac0296b7bdefc45ab7e",
+   "5bfaa6cb7ad856b8de95c2aaf84708e69b061041",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html.headers": [
@@ -694410,7 +694241,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html": [
-   "9682cc4cb25ae21171d1ae1d76c917f156bfddb7",
+   "11e17a1e839504e1bb7d81f1b6765b794c36dfdd",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html.headers": [
@@ -694418,7 +694249,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html": [
-   "6362258b77ae4b82e2903590931516bfcf823d2f",
+   "b1edae5abaa5c02db45b95f4fe8b61031a76f1ca",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html.headers": [
@@ -694426,7 +694257,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html": [
-   "317f9dc89980ff09270aa0b89230e545986a529b",
+   "b154facf1b3814cd24242a624d5bb7867fcc36ed",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html.headers": [
@@ -694434,7 +694265,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html": [
-   "7e5114e81060f43dcf6618d202f89244d073bef1",
+   "f58ee4d25335483201a18f0cbfc2fc62fcbc0724",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html.headers": [
@@ -694442,7 +694273,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html": [
-   "550b2c10d57c7d5b2a085f936aeacadeafbee8d1",
+   "f0b296a1ba1e0d1163b8254c4e80a531ead527e7",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html.headers": [
@@ -694450,7 +694281,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html": [
-   "abb407fb705a604e4ae2d218371c3dc0e704449d",
+   "eb15862751bb5949b931bfe2a4b748cb1bcd25e0",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html.headers": [
@@ -694458,7 +694289,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html": [
-   "dd4e877d1bc9545149ff90d297932d83025cf044",
+   "bd2d53ccb724b393d15a49ac89b3e6c078df815b",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html.headers": [
@@ -694466,7 +694297,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html": [
-   "4436f05931a2b63b6f391818f8fefd5101fbfd48",
+   "436e29bcb9e0f300ea84e649e738a1652a1b9cd4",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html.headers": [
@@ -694474,7 +694305,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html": [
-   "fba6c926d97d49594782d4a8285b4d51eea75fd9",
+   "0bafa8507045b834539fccbc55b071d458392a2c",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html.headers": [
@@ -694482,7 +694313,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html": [
-   "0350fd66e6c65e7b812b5999a82815a6f208c246",
+   "976bd16af58ef25ae7d1df9b01696f930afa2588",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html.headers": [
@@ -694490,7 +694321,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html": [
-   "03abe36f3691499516ae0b66a3f61e6d458d2447",
+   "81442203b0068f450d81ef75682992f424160e5a",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html.headers": [
@@ -694498,7 +694329,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html": [
-   "f220d76ba5ad11230c3941c7b69816e4d3d2d283",
+   "a48bb8bb008ce06c6c915dfc7abf7f11960b823a",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html.headers": [
@@ -694506,7 +694337,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html": [
-   "a97293eb16b1300c7b4fd4e266b342bcba042fa7",
+   "45589e04506bc01b3c1c326f2860440c625954d7",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html.headers": [
@@ -694514,7 +694345,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html": [
-   "256343a41021cb7939f04be08435be181b63527f",
+   "46b0761c37bfeb5d28bb99d234b3ed48ab3da041",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html.headers": [
@@ -694522,7 +694353,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html": [
-   "89da503edff2a20111bd8ae3926662448725caa2",
+   "4263c9ca372895aaf62ab654d89c811224135bcd",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html.headers": [
@@ -694530,7 +694361,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html": [
-   "566f78b287e6697e5a106ec3b47ebbdcf37d68f9",
+   "37aa91a2cc9a2cca3bcc8f81d9e2cec9343097c8",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html.headers": [
@@ -694538,7 +694369,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html": [
-   "64d7baa1f1a6fba2e6152cba31f6068c929fc56a",
+   "913aa0564a21aa6e8e62495dd9387b290a4cecbb",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html.headers": [
@@ -694546,7 +694377,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html": [
-   "1e087a18106a3aad9080036711bfceaf35155722",
+   "b33622d6fe8f98ba05591d7ddadb1436ef366aa7",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html.headers": [
@@ -694554,7 +694385,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html": [
-   "07d84ff367c4b89a8045262c8a7d52816d0d96b3",
+   "dbd1d6033fb45ea6ad917b278782dbc1a8670263",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html.headers": [
@@ -694562,7 +694393,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html": [
-   "55c2083a1fff49624395f72cf7b9a46449677e59",
+   "4e785bd9491a50d7f5a7386babebbcbc0d389325",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html.headers": [
@@ -694570,7 +694401,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html": [
-   "e0792a252e057ae80b03ce2fe5f16803dbbcf536",
+   "7cee1eef457eda25e63263c72e74d3c6bbce11f1",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html.headers": [
@@ -694578,7 +694409,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html": [
-   "3c2d87578dd74470f96879d3d64d6a47a16af05c",
+   "17ca3b0d905430dc0d3b0df11b9ecc7c0cd0ae37",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html.headers": [
@@ -694586,7 +694417,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.keep-origin.http.html": [
-   "bea5b349e2d42acf5c25a1ad0034aab353b33081",
+   "0dc78e462077a06d79ee8e6b22ee0ea92dcaca25",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.keep-origin.http.html.headers": [
@@ -694594,7 +694425,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.no-redirect.http.html": [
-   "a90fdc68ded6fb1c51651f408c5da759da0bb473",
+   "6646c6fc66b167b51ebf386cb2f7de1b7d7b75d3",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.no-redirect.http.html.headers": [
@@ -694602,7 +694433,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.swap-origin.http.html": [
-   "38040fe3495e424de9921d3277b88c96898faef4",
+   "5509539c492304d1446bcb08ac234f2863e9a1fe",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.swap-origin.http.html.headers": [
@@ -694610,7 +694441,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.keep-origin.http.html": [
-   "f0e9a7f1fb12628e1935996d056cff015a2c49cf",
+   "b2eac1b7ca6fb56068c519306d820389c1f477ae",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.keep-origin.http.html.headers": [
@@ -694618,7 +694449,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.no-redirect.http.html": [
-   "e5429b6e783bca522a3102b2a3863de644be7ba9",
+   "60d0079467a9a0d66e86f7dfb7f97c76c1c379a5",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.no-redirect.http.html.headers": [
@@ -694626,7 +694457,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.swap-origin.http.html": [
-   "2fbb14501991a109a023fd9dfda3a616ae74053e",
+   "d35863d9f2698cb516f079761b7f49190e3a97a4",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.swap-origin.http.html.headers": [
@@ -694634,7 +694465,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/a-tag/cross-http.no-redirect.http.html": [
-   "40aabbdfbea186fd1911da9c2bbe90749762ce8c",
+   "99ae09e0217cfc70b28659504b7a3cd496bf8beb",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/a-tag/cross-http.no-redirect.http.html.headers": [
@@ -694642,7 +694473,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/a-tag/cross-https.no-redirect.http.html": [
-   "3ca4033c4f5dc75410978f4bfcf87c4ea94ebdcd",
+   "766f4b0d7fa8324432e343ef5dcbefd1a425f4dc",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/a-tag/cross-https.no-redirect.http.html.headers": [
@@ -694650,7 +694481,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/a-tag/same-http.no-redirect.http.html": [
-   "9bffefa6f50c1b2d78c8f8a65c2606554a32e4bf",
+   "3e6668aa68c1c03df9a75775bbc603144d4cc77b",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/a-tag/same-http.no-redirect.http.html.headers": [
@@ -694658,7 +694489,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/a-tag/same-https.no-redirect.http.html": [
-   "2174421cf709deef128b9913660cdc4aefb1d2f9",
+   "5a43002170ad8c0fd8f5349492e68019e0d35fa9",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/a-tag/same-https.no-redirect.http.html.headers": [
@@ -694666,7 +694497,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/fetch/cross-http.keep-origin.http.html": [
-   "4f6f519fb35e73c9e8b9780638af201bf388a587",
+   "0c32a50951b3f7488b44c13caf01d9babf8c2e2a",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/fetch/cross-http.keep-origin.http.html.headers": [
@@ -694674,7 +694505,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/fetch/cross-http.no-redirect.http.html": [
-   "34a0c86b9788c9239e56fd6761827d4f7d3d12ff",
+   "8c308f3930042e93db5db5500b94e0dc1cb2ae72",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/fetch/cross-http.no-redirect.http.html.headers": [
@@ -694682,7 +694513,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/fetch/cross-http.swap-origin.http.html": [
-   "9e8df6a1d894e1f6f502b21612437bbb5d4491de",
+   "ce2759ce911015ac4d3bbc41f8ceec005930c102",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/fetch/cross-http.swap-origin.http.html.headers": [
@@ -694690,7 +694521,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/fetch/cross-https.keep-origin.http.html": [
-   "e36c3b5d24794d2696cf0a69320959deb647f4df",
+   "36adf76da5bc9716f2a1ea28e61e06de3bc5f163",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/fetch/cross-https.keep-origin.http.html.headers": [
@@ -694698,7 +694529,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/fetch/cross-https.no-redirect.http.html": [
-   "2e0052a4ea0d2f29d7c04a3ffefe3118a1768276",
+   "5acbeceff051635f85bcb1c94e6b522887712e19",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/fetch/cross-https.no-redirect.http.html.headers": [
@@ -694706,7 +694537,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/fetch/cross-https.swap-origin.http.html": [
-   "58bc8bd6c848bb42d8a5a15cf118a801a827e791",
+   "69a332698990e83aeadeeec38c5fe37a5d29a5dc",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/fetch/cross-https.swap-origin.http.html.headers": [
@@ -694714,7 +694545,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/fetch/same-http.keep-origin.http.html": [
-   "27dd44cc172fd0e09cbf3b1b286cdfd7fae14613",
+   "7f8590b55c4c86be6ad9a4df2fb8584aba95d576",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/fetch/same-http.keep-origin.http.html.headers": [
@@ -694722,7 +694553,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/fetch/same-http.no-redirect.http.html": [
-   "f6b77d4d1495aa5522ba193a47b5bc6b3ee56fb1",
+   "3c664a3c68bc4e1128d2b13d16ec158fc4db4abd",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/fetch/same-http.no-redirect.http.html.headers": [
@@ -694730,7 +694561,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/fetch/same-http.swap-origin.http.html": [
-   "9c1f0e0cfd9e891e092aeb8cdea44a7e2663984e",
+   "e0b6d2a7d94294f8b2ff43b5ee0e9bad6d0409d6",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/fetch/same-http.swap-origin.http.html.headers": [
@@ -694738,7 +694569,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/fetch/same-https.keep-origin.http.html": [
-   "51d5c12f1106c5d02e06f23076d0cd40dc2bd16d",
+   "f6ba0d1be63de097146875008959159b793d49f2",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/fetch/same-https.keep-origin.http.html.headers": [
@@ -694746,7 +694577,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/fetch/same-https.no-redirect.http.html": [
-   "c79ae7428783300049efdcddadb6c7237fcb885b",
+   "ba22bcd31a10394b1f423041e44735267a5a28bd",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/fetch/same-https.no-redirect.http.html.headers": [
@@ -694754,7 +694585,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/fetch/same-https.swap-origin.http.html": [
-   "b36071d3e11358ef539b52792d441baed3559ed7",
+   "448160faccfbb57e3e6461110fa610b0b0588f39",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/fetch/same-https.swap-origin.http.html.headers": [
@@ -694762,7 +694593,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.keep-origin.http.html": [
-   "4f7bd2ddb7ccb05489756664d114cf00acfe8756",
+   "2d0778fd9193f85414758ca68c9ed9b4bcd1446d",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.keep-origin.http.html.headers": [
@@ -694770,7 +694601,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.no-redirect.http.html": [
-   "a4dae22bfb98970dde15f01464a731a96abc8e1d",
+   "f19cca83cfe4249968de7e771b775d7d4c09e540",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.no-redirect.http.html.headers": [
@@ -694778,7 +694609,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.swap-origin.http.html": [
-   "7818554992ae13ed9dc85f58177a5bd25fe5e633",
+   "3d049834cac802d03d2b2ad0e9bc3ab90df47cb5",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.swap-origin.http.html.headers": [
@@ -694786,7 +694617,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.keep-origin.http.html": [
-   "f1fe7c006f1026be87da5febd7c45326dc0d55ae",
+   "81c10f2dd9ab3087891a179dea6862a708584289",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.keep-origin.http.html.headers": [
@@ -694794,7 +694625,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.no-redirect.http.html": [
-   "933c6729d4a52e4766207c7e497e01164fb1c57d",
+   "338a487d7d7f1344d020afedc068c91e8f926436",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.no-redirect.http.html.headers": [
@@ -694802,7 +694633,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.swap-origin.http.html": [
-   "d315738e0e7acb0c84d6bca5225af3d2fc0ad355",
+   "5c0951d525aacaeda743a9be43321d9c47af16e0",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.swap-origin.http.html.headers": [
@@ -694810,7 +694641,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.keep-origin.http.html": [
-   "178968e6db399c2494276d28402f03a3894a83eb",
+   "0b599bea5b78491bade0ca3fd2563a34e297940d",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.keep-origin.http.html.headers": [
@@ -694818,7 +694649,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.no-redirect.http.html": [
-   "65213cf1074d26e8e9326f2615f7f76a528af6fa",
+   "32d73c1743c15d56972f13546d1e7af43eb1135b",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.no-redirect.http.html.headers": [
@@ -694826,7 +694657,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.swap-origin.http.html": [
-   "ca9c9df1ef8e23bbebb2f9f9e222e95ba2421e64",
+   "d41f8f6eed1dbcaea6de8743f33572af4158e23f",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.swap-origin.http.html.headers": [
@@ -694834,7 +694665,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.keep-origin.http.html": [
-   "9636530141fcf5ceea7dce2039334e8f9870a512",
+   "99f63208e4825f4fede9b9cd38ed4495d3b22b2c",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.keep-origin.http.html.headers": [
@@ -694842,7 +694673,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.no-redirect.http.html": [
-   "3d04897f9b29a5b4241c98bcf380b1675961b9f8",
+   "69305a0b48459a637d15b1b60c0db76db85e6506",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.no-redirect.http.html.headers": [
@@ -694850,7 +694681,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.swap-origin.http.html": [
-   "1a3508e9a1fc39c9fd73ff6d9b41c9affcf18cbb",
+   "eef425d5ffd1f4296e77d84f12de8900296fbfaf",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.swap-origin.http.html.headers": [
@@ -694858,7 +694689,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.keep-origin.http.html": [
-   "6670d6d8a4136fee457871d0476ab876ebd30d48",
+   "97bb25aef5bfb157abb5990c8c871a3039822407",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.keep-origin.http.html.headers": [
@@ -694866,7 +694697,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.no-redirect.http.html": [
-   "c25a33644e9eaf23da1cd4bed375ad89f6b3354d",
+   "2e11e4486f9e356061e1d11ec3a65a09f81ac21f",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.no-redirect.http.html.headers": [
@@ -694874,7 +694705,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.swap-origin.http.html": [
-   "3d7ad2168dc4e302ebe0665497d2f43e9ce3af37",
+   "60775ba765dd7eca88f0e175bdc3ae598c80e779",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.swap-origin.http.html.headers": [
@@ -694882,7 +694713,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.keep-origin.http.html": [
-   "a11fa5d93fd9d28591182fd5adbadd2b01d61548",
+   "ac8d8a9ad2d03b70d261f466b68f88005d5b9704",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.keep-origin.http.html.headers": [
@@ -694890,7 +694721,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.no-redirect.http.html": [
-   "11a545f1e79ea38d1fa23bd1734650f13a0b5440",
+   "f7ecbdc6e3d7edb6e32b970fce1c8714b219f9f4",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.no-redirect.http.html.headers": [
@@ -694898,7 +694729,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.swap-origin.http.html": [
-   "21c6d95057e18058f9e548acb2206a377c41e380",
+   "ca99ee00c2b93a38b5abaa06b558fc832581c77c",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.swap-origin.http.html.headers": [
@@ -694906,7 +694737,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/img-tag/same-http.keep-origin.http.html": [
-   "ff1ab459defede4fcf91d74b634f564af1700d78",
+   "39f770cec8cccf9e3445f8b4e38375de94514274",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/img-tag/same-http.keep-origin.http.html.headers": [
@@ -694914,7 +694745,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/img-tag/same-http.no-redirect.http.html": [
-   "1b6646dacb9c16fe91c94d61622dd1b5536f9fb6",
+   "67a83a860dd81544ee0dd9f9d3b18bb4c2b9cb91",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/img-tag/same-http.no-redirect.http.html.headers": [
@@ -694922,7 +694753,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/img-tag/same-http.swap-origin.http.html": [
-   "0d17830d02000ca293de870ff3a85c334742feda",
+   "db5f2e1f9730b7c9abcb1a354403e1e51d920b24",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/img-tag/same-http.swap-origin.http.html.headers": [
@@ -694930,7 +694761,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/img-tag/same-https.keep-origin.http.html": [
-   "3a05e06ed0dde98b6b2a380f99421a7a0df15852",
+   "12c2f63db133eefa876c9aeb31822127adf4c61e",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/img-tag/same-https.keep-origin.http.html.headers": [
@@ -694938,7 +694769,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/img-tag/same-https.no-redirect.http.html": [
-   "c33af79980a198fc92fedb040649dce5a6587d20",
+   "577f687c9cd0f36618df83752b0a57d910f36780",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/img-tag/same-https.no-redirect.http.html.headers": [
@@ -694946,7 +694777,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/img-tag/same-https.swap-origin.http.html": [
-   "92344ccb466aa31e91e0da1b330f145b77681d8e",
+   "df9ceec26bf5dced2a7a32acf484217f4f689b6e",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/img-tag/same-https.swap-origin.http.html.headers": [
@@ -694954,7 +694785,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.keep-origin.http.html": [
-   "8351133d2e1865849fcd6db651ecd00ba330e687",
+   "22da8eed11b115d67e132057a43a89264899f37c",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.keep-origin.http.html.headers": [
@@ -694962,7 +694793,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.no-redirect.http.html": [
-   "945f2bb4617166555a394432dc3a8b12af2baacd",
+   "29c997ce789518741ba198cc5965b832151bb894",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.no-redirect.http.html.headers": [
@@ -694970,7 +694801,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.swap-origin.http.html": [
-   "bf97f96ea5bbaeedc75ab12f36bd7391f49b351b",
+   "686d752e0e25bde064fb706697158b771670a242",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.swap-origin.http.html.headers": [
@@ -694978,7 +694809,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.keep-origin.http.html": [
-   "26c541a27fd68264967a5e7e7b63ea7d78e338d7",
+   "19b2b3cde20b07437f7f3f4d86c9dc99705aca08",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.keep-origin.http.html.headers": [
@@ -694986,7 +694817,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.no-redirect.http.html": [
-   "a78bdd5a909250bb5aac300b6e3537c5dc3eb1ee",
+   "9c29b03778f69851262c1f47df9d096ba850853f",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.no-redirect.http.html.headers": [
@@ -694994,7 +694825,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.swap-origin.http.html": [
-   "050da344555e268ed127b4d8b84c1c071820291a",
+   "834b8f3b4c328df842d89f7047459f59e9681add",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.swap-origin.http.html.headers": [
@@ -695002,7 +694833,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/script-tag/same-http.keep-origin.http.html": [
-   "829caf653a82a793c7171d31d2e489910cabcaeb",
+   "2a5d372f1350600ebdd386118eb6b5b5b661709c",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/script-tag/same-http.keep-origin.http.html.headers": [
@@ -695010,7 +694841,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/script-tag/same-http.no-redirect.http.html": [
-   "ab8aabba902fe4d9f1b21cc9fd3bc94c58248242",
+   "ad482734571627ceceefece74aa3b69297f7a677",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/script-tag/same-http.no-redirect.http.html.headers": [
@@ -695018,7 +694849,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/script-tag/same-http.swap-origin.http.html": [
-   "2d6ba47b75a8c23e38dac56b1fd7fef1a273506a",
+   "0b95cd122b3da478bddf19b2729b0eb0433e17c1",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/script-tag/same-http.swap-origin.http.html.headers": [
@@ -695026,7 +694857,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/script-tag/same-https.keep-origin.http.html": [
-   "af54beeacab43c08386084c4a34656bf6dfd551f",
+   "9402a90b4fc2f8a9aaf27b3026fdd5ca50fabf5b",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/script-tag/same-https.keep-origin.http.html.headers": [
@@ -695034,7 +694865,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/script-tag/same-https.no-redirect.http.html": [
-   "3d7ed51d9ff559c0e33bd77dc25c293849c126b0",
+   "12d7fa65b5d5ab3b02a5e44a649f1799bd1f0b96",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/script-tag/same-https.no-redirect.http.html.headers": [
@@ -695042,7 +694873,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/script-tag/same-https.swap-origin.http.html": [
-   "8c2c449345298ec4aa9ae4df59064c4a081d0a9b",
+   "483a21bb49db34a859c531751cb5f4b996bdfad8",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/script-tag/same-https.swap-origin.http.html.headers": [
@@ -695050,7 +694881,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.keep-origin.http.html": [
-   "8b26ae4b565bed9e92ddb3547564c081467449e7",
+   "9bb9edc5dde29dfc53c7b955074d02b8ba5622f0",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.keep-origin.http.html.headers": [
@@ -695058,7 +694889,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.no-redirect.http.html": [
-   "2e11e130dfccd3396dd8c580736a952e80efc01a",
+   "d4c469d0cf32448937ffa667ac9c654c6b12fbab",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.no-redirect.http.html.headers": [
@@ -695066,7 +694897,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.keep-origin.http.html": [
-   "7e2272825d6476f474794da90c6cf68cd1a30ad3",
+   "f209c5c14163c340da09dba9fd36c014bacf2c4c",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.keep-origin.http.html.headers": [
@@ -695074,7 +694905,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.no-redirect.http.html": [
-   "382e1862566fae5064432247fe206e6a2ea78e01",
+   "dd362554e067e015c0aac88731e60ce8e699f972",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.no-redirect.http.html.headers": [
@@ -695082,7 +694913,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/worker-module/same-http.keep-origin.http.html": [
-   "8179b7a1e41cc2888a1282978ad96bfa15886c79",
+   "7d8d98b8e97cc47f17eef147261d56dfb74f4266",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/worker-module/same-http.keep-origin.http.html.headers": [
@@ -695090,7 +694921,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/worker-module/same-http.no-redirect.http.html": [
-   "51f2f9e709f264a071a4ae8fff1331ef2c162409",
+   "1d6c72b408ab89d070d37b15143daba9e2ab393d",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/worker-module/same-http.no-redirect.http.html.headers": [
@@ -695098,7 +694929,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/xhr/cross-http.keep-origin.http.html": [
-   "a41d69ad7b262a363fc0c13d00dba7c81bed6099",
+   "e6d8e3adf1eff3673173084bcba2e35695442f98",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/xhr/cross-http.keep-origin.http.html.headers": [
@@ -695106,7 +694937,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/xhr/cross-http.no-redirect.http.html": [
-   "456f0bf7025cd94913500f18d3c502eb29423c84",
+   "8699a38d26d1358641a152ed174574e07914209b",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/xhr/cross-http.no-redirect.http.html.headers": [
@@ -695114,7 +694945,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/xhr/cross-http.swap-origin.http.html": [
-   "0081e74065be8dec7482e51e2bc2d2d3a3a6be2a",
+   "32318f63888bedc2cdd80b2e14b4d5cd05c75144",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/xhr/cross-http.swap-origin.http.html.headers": [
@@ -695122,7 +694953,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/xhr/cross-https.keep-origin.http.html": [
-   "7abd36b9518382e7f6ca11198ee3e060e559e91b",
+   "ee0d6ef999dfb9a7612ded27ca979e4002bae6a3",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/xhr/cross-https.keep-origin.http.html.headers": [
@@ -695130,7 +694961,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/xhr/cross-https.no-redirect.http.html": [
-   "0394d16ece239989e609a791d533fc3b2b7d21fd",
+   "ab5bbcd25b7e8fdd59bf4579b32bd30f71762777",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/xhr/cross-https.no-redirect.http.html.headers": [
@@ -695138,7 +694969,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/xhr/cross-https.swap-origin.http.html": [
-   "315b1af6c72785e03222a1314bea6473a52b998b",
+   "6cb441f026fd6abc5503d91fe5a79d1f0f918954",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/xhr/cross-https.swap-origin.http.html.headers": [
@@ -695146,7 +694977,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/xhr/same-http.keep-origin.http.html": [
-   "227aec5a81d1d913389084e7bbe3d9ba31982c9b",
+   "5bfdc033c77ae633add1bd5dc9211886886d1582",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/xhr/same-http.keep-origin.http.html.headers": [
@@ -695154,7 +694985,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/xhr/same-http.no-redirect.http.html": [
-   "a1f6d307ead6ee8155dd188d1eb18d7e5df7c9d9",
+   "32e1ffa0a5f8e54032123be1ab99212a15accb34",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/xhr/same-http.no-redirect.http.html.headers": [
@@ -695162,7 +694993,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/xhr/same-http.swap-origin.http.html": [
-   "1752869527925da764b4a9759a1b9ddaa7dd2495",
+   "ac57d090c72f946acbccdd0ba10a19903d0f02c8",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/xhr/same-http.swap-origin.http.html.headers": [
@@ -695170,7 +695001,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/xhr/same-https.keep-origin.http.html": [
-   "45ad932c87c41e7eb09d1343c8416a52e85e5e05",
+   "9465c026fe0ba81dcdf56c5f0bb05859567e51b9",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/xhr/same-https.keep-origin.http.html.headers": [
@@ -695178,7 +695009,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/xhr/same-https.no-redirect.http.html": [
-   "24b16af2b5ed7eb8911554178ad633c635d3869d",
+   "7e57d479231b26fc02290daf05386676b0eb7566",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/xhr/same-https.no-redirect.http.html.headers": [
@@ -695186,7 +695017,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/origin/xhr/same-https.swap-origin.http.html": [
-   "a2c0e8ae4440fa3fc6f76ebfe052df92efbea581",
+   "e1bbbc32e8a1c5fe7eb48083de082afa14a65aa5",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/origin/xhr/same-https.swap-origin.http.html.headers": [
@@ -695194,7 +695025,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/a-tag/cross-http.no-redirect.http.html": [
-   "2b9d2097e37b4d50562221c4135a0e243aa787bc",
+   "3cc76c77ed81ff316f5d3e190760a059b0ad8f81",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/a-tag/cross-http.no-redirect.http.html.headers": [
@@ -695202,7 +695033,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/a-tag/cross-https.no-redirect.http.html": [
-   "f47e6918ffc3ec356c4a9ca0c671ce185ae42202",
+   "129f9649b389fc0081acd4be0fc733d095a0150d",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/a-tag/cross-https.no-redirect.http.html.headers": [
@@ -695210,7 +695041,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/a-tag/same-http.no-redirect.http.html": [
-   "13f42bcf980a7a099754b87cf9930f94d8bf1533",
+   "beaf04faae158d031db95c42c5a64efce59d73da",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/a-tag/same-http.no-redirect.http.html.headers": [
@@ -695218,7 +695049,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.keep-origin.http.html": [
-   "8f34e4b40b31b3593e80b21c5afb6557a83e0ede",
+   "2940080f25fa466dabb0c4ef054ddf119907c611",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.keep-origin.http.html.headers": [
@@ -695226,7 +695057,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.no-redirect.http.html": [
-   "1508e7b65d26cb17ea6b47ab793289b6b5942d60",
+   "f7ae2c15f638558f0b5a16c0468b65a53d578391",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.no-redirect.http.html.headers": [
@@ -695234,7 +695065,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.swap-origin.http.html": [
-   "7aee58850d68b6a6cac9981c6a0387cabe5feafe",
+   "39087e48490889c4037686b4240b1df08925635c",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.swap-origin.http.html.headers": [
@@ -695242,7 +695073,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.keep-origin.http.html": [
-   "3fb3fc860c4d5b848cd13f06138df6394718ccff",
+   "f33ff335dc9b05b63c1e91ab2b59d1497ffc23f7",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.keep-origin.http.html.headers": [
@@ -695250,7 +695081,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.no-redirect.http.html": [
-   "fce68ea7cd6b8a4a56dbd20e6a8ff1ef1f14639d",
+   "ddaebd579923961a9feefcaf4403197e58ffe012",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.no-redirect.http.html.headers": [
@@ -695258,7 +695089,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.swap-origin.http.html": [
-   "ce29d475272fbe0d994423796e6644c85ff42984",
+   "d594aaf60641a2e66f1054b62ca640c61162fd59",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.swap-origin.http.html.headers": [
@@ -695266,7 +695097,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.keep-origin.http.html": [
-   "b08ea62152b8798cf9aac5fe92c1cf006e9e75bd",
+   "13b32f75254095a8441158c78803bd59a1916bbd",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.keep-origin.http.html.headers": [
@@ -695274,7 +695105,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.no-redirect.http.html": [
-   "c3228e68db7c889dd5f45afd428c4cb886c7e50a",
+   "d7938aa553c1cc8265d2eda45cec610457714453",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.no-redirect.http.html.headers": [
@@ -695282,7 +695113,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.swap-origin.http.html": [
-   "959da6b41ffb7aac3cc6364baf7537ecc2ced0e5",
+   "db62a2b1dbe556a18087197531cc24da19a16cfd",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.swap-origin.http.html.headers": [
@@ -695290,7 +695121,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/fetch/same-https.swap-origin.http.html": [
-   "7d4cd7464ffa9f002eec66ed4a83d716fd2719e2",
+   "01849606f0b146984f4860282645d61f57a93b67",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/fetch/same-https.swap-origin.http.html.headers": [
@@ -695298,7 +695129,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.keep-origin.http.html": [
-   "21f8c3133c6fbbf18fb3134d5cfb466b19df4c5e",
+   "d5dc8ad754db8c9b99a7167a60409d684d5f7176",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.keep-origin.http.html.headers": [
@@ -695306,7 +695137,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.no-redirect.http.html": [
-   "9280b146790c67f24ae6d0343dc1aaaa8105676f",
+   "bb2006273a6f0683ed633d644978e6b93d0a3e7c",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.no-redirect.http.html.headers": [
@@ -695314,7 +695145,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.swap-origin.http.html": [
-   "de7dd9fc27ebeb130531fa3fef20af274a0fe221",
+   "76df663efcf098f999cbde346e5c7dcab30bee0f",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.swap-origin.http.html.headers": [
@@ -695322,7 +695153,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.keep-origin.http.html": [
-   "3fe94d95d014dd07dde3744ac67d13e84c561851",
+   "0b0d49bb2b252c3d0daf3e93a106eda01c57e9bf",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.keep-origin.http.html.headers": [
@@ -695330,7 +695161,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.no-redirect.http.html": [
-   "147691d1211952b32e27e4cc26c86ee9bff5dc91",
+   "aecdddae47e907efb111e78fd741f56018047c70",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.no-redirect.http.html.headers": [
@@ -695338,7 +695169,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.swap-origin.http.html": [
-   "10f02d38b7c10eecd7e094200cbc1e4f50b3e563",
+   "c591a8b6078b7d5ebd2ec3cdc870e1b5f79d4892",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.swap-origin.http.html.headers": [
@@ -695346,7 +695177,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.keep-origin.http.html": [
-   "839a460e2f3b75730519f1e1571e4910ac6a0b77",
+   "002f1b0b1fd6cd02d493c63ef2097de5d7d17bec",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.keep-origin.http.html.headers": [
@@ -695354,7 +695185,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.no-redirect.http.html": [
-   "6adde4099e3cd1edfd9608fbd23e029ecf3038cb",
+   "a11ea0016d8a5fcfaa42841cd585e787cd2b9f3f",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.no-redirect.http.html.headers": [
@@ -695362,7 +695193,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.swap-origin.http.html": [
-   "18b9318f0ae9e8bd25d81a53e3aa661da2e20f2a",
+   "42d5b63bddf9094de8adc264c4894ccd54a5ca57",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.swap-origin.http.html.headers": [
@@ -695370,7 +695201,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-https.swap-origin.http.html": [
-   "99754a15bc4298fc37826d81e69cc764673b3b86",
+   "054ef8e1c8ad870b81424bb2bf9de7d0eac543ba",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-https.swap-origin.http.html.headers": [
@@ -695378,7 +695209,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html": [
-   "7d76b2d01f612eb92f6db18eacac466f83ed622e",
+   "757c6cf5a1c9b8ad672c4b491f828a57d733b444",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html.headers": [
@@ -695386,7 +695217,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html": [
-   "6f3f81efed23861ec29fe5ef89bff77392c22e21",
+   "7656846845d58b02287a67eff57a319e28fef77d",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html.headers": [
@@ -695394,7 +695225,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html": [
-   "07644228697e12859a37954b91965757d7cca1ca",
+   "487d0a624e37db7bf18830ef5369d8d0528b6c85",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html.headers": [
@@ -695402,7 +695233,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html": [
-   "c99b805ee6fa2471d12f5af89fcea7e9a35174f7",
+   "3276d4a996ae285010609ccffbd1c755f3757c2b",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html.headers": [
@@ -695410,7 +695241,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html": [
-   "abd5da87073961f0d3c38a3c54abd26e4c8aff48",
+   "f6fb89af57e21755a321db82e18ddbfad1a7fbf8",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html.headers": [
@@ -695418,7 +695249,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html": [
-   "de3f34e6ed6171cdf73fab2a204f8750bf75125f",
+   "680dcfd4bd94c7a5c98fc7cc7ff6f7ca11d63e99",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html.headers": [
@@ -695426,7 +695257,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.keep-origin.http.html": [
-   "02890f0133925c3d8119da9cce6ebbd9bb8a3128",
+   "5c84aae4866c6f76e4f202078d6182931edb0cf5",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.keep-origin.http.html.headers": [
@@ -695434,7 +695265,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.no-redirect.http.html": [
-   "d53b6b671519930f78b7c5c4ce155f682a04ecb2",
+   "717507f9265502857b53bef46cbe9f0908a2dd15",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.no-redirect.http.html.headers": [
@@ -695442,7 +695273,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.swap-origin.http.html": [
-   "e7f8f4e1ce8a33c0454ae02b4f338b82a9379e06",
+   "919c0f8a5a10bc53f8997487bb81906616cff715",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.swap-origin.http.html.headers": [
@@ -695450,7 +695281,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/img-tag/same-https.swap-origin.http.html": [
-   "323971aceff3baf9c5e5873c35b5886a7d2bc2fe",
+   "af9925a845151494e0b3494b0a31d00a00f84a6e",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/img-tag/same-https.swap-origin.http.html.headers": [
@@ -695458,7 +695289,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.keep-origin.http.html": [
-   "9339fe1536d4b9842b02d73648ab3cc7db277513",
+   "c7143f684228de1debe8254e80d66b2b613fab46",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.keep-origin.http.html.headers": [
@@ -695466,7 +695297,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.no-redirect.http.html": [
-   "eb440bf0e39bc147e3c19e1be0fa96b5a3e77320",
+   "961cb3aeb38e4d038f17c5981a2aaeacc77aed58",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.no-redirect.http.html.headers": [
@@ -695474,7 +695305,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.swap-origin.http.html": [
-   "c86ad7a9c522813cd4a95d189de0460349a57bf3",
+   "3db832952160d149eb681208c0267833d94d4d79",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.swap-origin.http.html.headers": [
@@ -695482,7 +695313,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.keep-origin.http.html": [
-   "f61132e76846a3b2d076130080f849173ca63f68",
+   "139b04add45c98aa426d6f220c28d0c6bced5a2b",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.keep-origin.http.html.headers": [
@@ -695490,7 +695321,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.no-redirect.http.html": [
-   "b62e58c79634c570ad17526855752308f6f17acd",
+   "ec0e8df140323f96e7b148d2b8b479ce02bf21c2",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.no-redirect.http.html.headers": [
@@ -695498,7 +695329,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.swap-origin.http.html": [
-   "78b5d49337a318139830bf8c4a169a7de7123ef2",
+   "1be2acd3785fde7cc8f8abf4d8b62d8d7ce7929f",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.swap-origin.http.html.headers": [
@@ -695506,7 +695337,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.keep-origin.http.html": [
-   "0aed5b01195208435207b266e1982cdf72462584",
+   "24e5f26ba79d2d060940a49ee2c933c966405669",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.keep-origin.http.html.headers": [
@@ -695514,7 +695345,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.no-redirect.http.html": [
-   "7a6f1a2788f1115f349ce1a9cb7ebc74db7fdeb4",
+   "1a990220ec355d39852d756ef963135e7f1ceb4e",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.no-redirect.http.html.headers": [
@@ -695522,7 +695353,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.swap-origin.http.html": [
-   "433b905fd3646ce266f1163e587289f749849361",
+   "7a361b751477d89b0ed6ead1d4ddad3103383853",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.swap-origin.http.html.headers": [
@@ -695530,7 +695361,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/script-tag/same-https.swap-origin.http.html": [
-   "a18912fb172c9f51a97fd60b0f1efc13b7760f3d",
+   "188c8b0e5de0ecaa2f770b26f0d17aa45f3e67e8",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/script-tag/same-https.swap-origin.http.html.headers": [
@@ -695538,7 +695369,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.keep-origin.http.html": [
-   "8528aa8643319de75167d8be8265b5506398fffc",
+   "9f4a1d47f2f54881b2bae4aebdada20d1e6e0d27",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.keep-origin.http.html.headers": [
@@ -695546,7 +695377,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.no-redirect.http.html": [
-   "f2e87c9c86e8828eb3b27c3481310ec62e0721d4",
+   "166160a96edb0cd92efa8008125c24b461478d6d",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.no-redirect.http.html.headers": [
@@ -695554,7 +695385,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.keep-origin.http.html": [
-   "4478b057eac8217eb92d30b9a65e54836daf9fa7",
+   "5ee8e5e26f3355fbf1cd8786b8d3ab8a98071915",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.keep-origin.http.html.headers": [
@@ -695562,7 +695393,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.no-redirect.http.html": [
-   "971c35f3f175230b4d73ccb39398ba2e4cf78c9e",
+   "22f2b90fbc46fe934f55018b731dfbb8b9d16d73",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.no-redirect.http.html.headers": [
@@ -695570,7 +695401,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.keep-origin.http.html": [
-   "4646ac18bcc74d644c3e8d3dd7061db535405a1c",
+   "19792dccaeaf53fa998cb1ba7df0f5eaccd34a0c",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.keep-origin.http.html.headers": [
@@ -695578,7 +695409,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.no-redirect.http.html": [
-   "34380c9974f4f58ac6ddc6954f5014ceed0ea7ff",
+   "372ef3032a22bae8ff93ea2114e20194b02581af",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.no-redirect.http.html.headers": [
@@ -695586,7 +695417,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.keep-origin.http.html": [
-   "991590d42e1a6f0d2d611b33d1af72807c86fd4b",
+   "907011965142327d53c32ab977c7f1c8ec718edb",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.keep-origin.http.html.headers": [
@@ -695594,7 +695425,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.no-redirect.http.html": [
-   "d1c5e7679d5e8c0b0090f54542ffa080e71db3aa",
+   "54a7216fe5f2667d3d4c74cfb0c39b87bb9fd87e",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.no-redirect.http.html.headers": [
@@ -695602,7 +695433,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.swap-origin.http.html": [
-   "4d59243b94a7294fdccedee07f2f4f0fc30753b0",
+   "1562379d9c5d66705a90f3147b88641376028d70",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.swap-origin.http.html.headers": [
@@ -695610,7 +695441,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.keep-origin.http.html": [
-   "9fe84a6563e999f654abba88cb57bee2268071c8",
+   "c8d6c8ce57dddff5baca1ca21fbd33baf74606aa",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.keep-origin.http.html.headers": [
@@ -695618,7 +695449,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.no-redirect.http.html": [
-   "68c246747918a4e10d0b9713ecac3da63944a056",
+   "7e2fe401a09929dc76b3c52917c780937a8d5f20",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.no-redirect.http.html.headers": [
@@ -695626,7 +695457,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.swap-origin.http.html": [
-   "cde13783182494c1e0c7e48d7b2701e4328fbad3",
+   "8d658e01fd3f0d7e6e3d37797351dae14776a77e",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.swap-origin.http.html.headers": [
@@ -695634,7 +695465,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.keep-origin.http.html": [
-   "02b2b05ea96b19bd62cb3a93839f50243bfd4013",
+   "13927c018f8ec3a01f0f12c496e22323fb37a4ae",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.keep-origin.http.html.headers": [
@@ -695642,7 +695473,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.no-redirect.http.html": [
-   "b82f10fac5db4f170fbc536da484372306722eef",
+   "08592522be39425d0e9398cd2fc7d5263a432e67",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.no-redirect.http.html.headers": [
@@ -695650,7 +695481,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.swap-origin.http.html": [
-   "0a691b51adfb938c37c1a6370dc11f193465adba",
+   "00fa8971d937f0d99fd8f3e172f763d865b41802",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.swap-origin.http.html.headers": [
@@ -695658,7 +695489,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/xhr/same-https.swap-origin.http.html": [
-   "84c5c47a5bdcdf6c75f8db1b1c2441c54bdf002b",
+   "effafc051374ebcb061b818f4afb3ff464fb53fd",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/same-origin/xhr/same-https.swap-origin.http.html.headers": [
@@ -695666,7 +695497,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html": [
-   "381a8d7d27931daf5bdf7517621811e5205c4f53",
+   "3fb51410b875b6e3ae43029ebb4da52381cc97e7",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html.headers": [
@@ -695674,7 +695505,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html": [
-   "ce7471041828f95897595f9ef485533acfcef161",
+   "5b16684bb7501285a6067017611b1dcb48c9984a",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html.headers": [
@@ -695682,7 +695513,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html": [
-   "bed1549ef064904bb7a0f8e8135082a2b97a7ae7",
+   "981e166ba35a398748a7f717dbd8716b3ea30161",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html.headers": [
@@ -695690,7 +695521,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html": [
-   "b4a8996e8d1acedc5f77a00e06a0de9d60a527c9",
+   "50c149fcd20e3949e36052fc0166e883611a4269",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html.headers": [
@@ -695698,7 +695529,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html": [
-   "7ff567aac4175189dc25fd7be6dcec09433639bb",
+   "8a7503fc8cb1f4303cb31644fd5a59fd108b8744",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html.headers": [
@@ -695706,7 +695537,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html": [
-   "1d8baf9638b4f1042591b1e508b705f1cb62bc16",
+   "038e24dc669c02b6abaa9b7c480a263f1ef191f0",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html.headers": [
@@ -695714,7 +695545,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html": [
-   "0b9637e29e03503be7e369cec1b69ae80b8add16",
+   "e241e786f223e16267291eb1cd7422038a9bd90a",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html.headers": [
@@ -695722,7 +695553,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html": [
-   "8356d022948d48bdd466b3167f776fe94df0dd7b",
+   "5dbdb557500719714ed771be4968bfeb569d19d4",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html.headers": [
@@ -695730,7 +695561,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html": [
-   "7549a656c6fedf48669334d92e4536d7986e925e",
+   "4cb9828923ff40e8e6d30edba15256e85f85de10",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html.headers": [
@@ -695738,7 +695569,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html": [
-   "f9b940e0324949388fc9fbdece97e8be88175500",
+   "a0b52e564499253ce11fb0997b912fcb77e6531a",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html.headers": [
@@ -695746,7 +695577,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html": [
-   "dd7a24720993effa40ae7d0b5da4158215202f4f",
+   "5e4a8449dc807e19fdd6d0f5225e3bf4e3304373",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html.headers": [
@@ -695754,7 +695585,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html": [
-   "cba214803a5e011fa897bdf2428892b97c0da226",
+   "578307ac34023edb6aab200c038a47030170982d",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html.headers": [
@@ -695762,7 +695593,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html": [
-   "8d4768f30dc62d65d340dd6f8ab5800c3b49e4db",
+   "0c41cffd697993516b3de95b14c8fc7756756af6",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html.headers": [
@@ -695770,7 +695601,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html": [
-   "242469e626a2a056ecc2de8d95ecee7e38bc78f0",
+   "43dbd10f9c4d355f8b9c539d8fbeff0d3f440e33",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html.headers": [
@@ -695778,7 +695609,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html": [
-   "e2daede730a6ec2ac0723ceff3047f22b93b2677",
+   "99c62812041c8310124a15c0b577f4759e500e96",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html.headers": [
@@ -695786,7 +695617,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html": [
-   "247684e333cd1e411f4c5f8eed703bbe57cd8665",
+   "23007609156ad58e85a84aa9832444e148dd8790",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html.headers": [
@@ -695794,7 +695625,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html": [
-   "d5ef4e6e93a33c1381549d20688ecd661dbe5e56",
+   "ca13e727f78732596caf0d5c4084da37e691203e",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html.headers": [
@@ -695802,7 +695633,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html": [
-   "5587203648cd2e7d8cfff4e8398fa8cf10aea901",
+   "a967ca30e5cb59cd18bac9d250db8e4f27462aec",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html.headers": [
@@ -695810,7 +695641,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html": [
-   "9bed03a541af1b54928aca90630cef63201db214",
+   "28ed9945efbbc343416cb325f17be38246f398a8",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html.headers": [
@@ -695818,7 +695649,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html": [
-   "9b114b16f40a954ba31beb05a2ec701334b83d33",
+   "7ac86c29b27bde8bec2342b6d77172298044c582",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html.headers": [
@@ -695826,7 +695657,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html": [
-   "2637b57bcd6402d562e39ccc4ab8dd4440601333",
+   "6d1288019509e89d2065bb909663ce979421488a",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html.headers": [
@@ -695834,7 +695665,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html": [
-   "6241294c21215cca11d6d1175e605870bbdced70",
+   "179cee2b8bf7e705210d86470991b2dae72e02e2",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html.headers": [
@@ -695842,7 +695673,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html": [
-   "654680d7d1e2ee0bb7b06f2ba524b7ae85febcaa",
+   "e4a15f4b7fe6775fd5ce95793a63db8dd1912614",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html.headers": [
@@ -695850,7 +695681,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html": [
-   "fed512ecdd5b49348fdf7336c007880c0921db9b",
+   "8b73fc151cdd72039751af1dc30a56b20b08a438",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html.headers": [
@@ -695858,7 +695689,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html": [
-   "f97f14d41b2e9f05fd10b18c0552459026a0ec50",
+   "60f4191fd1cd1b77eed65992d532cfdeb7b1205d",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html.headers": [
@@ -695866,7 +695697,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html": [
-   "56b9f6f86c37617d2feddf74e57c6ea45fd7831b",
+   "30d946e1120577bb310111873ca7da4f8479e59f",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html.headers": [
@@ -695874,7 +695705,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html": [
-   "aa9c6ffd19ffa620108090ae1ccbb7c965af6a9b",
+   "32f072019bc1a8dee7b0e767abf60ea881201d6d",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html.headers": [
@@ -695882,7 +695713,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html": [
-   "d995d234607e537cf029740a80ba90a36dd7d030",
+   "24de41cbfc0459ac26143d3d6c377f6c33392804",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html.headers": [
@@ -695890,7 +695721,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html": [
-   "6486b9dde2c7f17eb5bd76ebe40c086b06590f99",
+   "31c651b098ec56489d41a9ad1113f8166a917f82",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.headers": [
@@ -695898,7 +695729,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html": [
-   "1c49b3520d2237ddf587a274396ebe75786725c9",
+   "3e6139f6a5885d6e80ed61cbe2fb697de0150424",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.headers": [
@@ -695906,7 +695737,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html": [
-   "2bc4da51dc6383f89ee390a052c62839b06e10d2",
+   "8323b499ca095d11cd938d9772d9145dddd27a35",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.headers": [
@@ -695914,7 +695745,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html": [
-   "5e25e169f78b7376054baea7a72d01491935308c",
+   "761bf9bf47ddc7454b3b950060c041482caac2a3",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.headers": [
@@ -695922,7 +695753,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html": [
-   "81df37d3e4b727df4d5307d4a8e8f6d5963d0b67",
+   "9662bb3e45ff4f6d4ec548446b0d85446e1eeda0",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.headers": [
@@ -695930,7 +695761,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html": [
-   "f6f52aa85ba2693d09e991e4d9cd91ca99ce3008",
+   "985607ffeec1944c947a3fef024c91f328547a88",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.headers": [
@@ -695938,7 +695769,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html": [
-   "bf41468931af37c05e08d153f8d5605f39e30e61",
+   "8da5c17bc15a1a11c91528918ae23c4e51a1ee7b",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.headers": [
@@ -695946,7 +695777,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html": [
-   "b5f5ef832f24c96f68fae558a0718cc64ea88e2b",
+   "28d81ef1b2a773ef1673eac71931cc5654c2ef7f",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.headers": [
@@ -695954,7 +695785,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html": [
-   "fa1d2283dc5d5d1cdd98e32ab65224878af33d1f",
+   "95064a3451da6ebbdb5ed3739be06c04ccdff37c",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.headers": [
@@ -695962,7 +695793,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html": [
-   "f642c322c9d333766751a854ef70279482f3fcee",
+   "984f4b01d98fc63e6687a25400dc696fe0ebe9ad",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.headers": [
@@ -695970,7 +695801,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html": [
-   "073589c421d91ba8a3508af23abc6c8ced4359d3",
+   "0e240a08b50dde7872877191452b97919e29a88e",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.headers": [
@@ -695978,7 +695809,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html": [
-   "67d55d83c846827a86976baff0c50fca023b291e",
+   "69793c232a4a7acb864844dca85d16d19c5555e7",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.headers": [
@@ -695986,7 +695817,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html": [
-   "74767b3ea5b0ba94a54ebf19d1bf4927a4fc285c",
+   "aa7bd079fe5800ec01b43a8f259854d6a1ead1dd",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html.headers": [
@@ -695994,7 +695825,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html": [
-   "e4926582f1de905ec3d57bc9802ddce6ba3aad1b",
+   "413a2284bdb9747388ca77e71f5fa391910e86a8",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html.headers": [
@@ -696002,7 +695833,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html": [
-   "2f9c2e45d980e346106d9f5eda61f6037a5fbe18",
+   "3a7483358ab15395a023fdcdf7c2be0eed45356b",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html.headers": [
@@ -696010,7 +695841,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html": [
-   "19f399b9736214ce6326d20a4dacd60519a71bd8",
+   "5bb16577d04a3fd94b12379ea534aed1d40eb09b",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html.headers": [
@@ -696018,7 +695849,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html": [
-   "ae82747b73f36dca0d120e3861b7a43a317f2783",
+   "0bb50cc658b38701dc252aa9cecbb46532545fee",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html.headers": [
@@ -696026,7 +695857,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html": [
-   "2435daa311b55aa5ae3de59aedd63660da502779",
+   "23642733b3f78794c57d52dea976ee7bf4ac9ae5",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html.headers": [
@@ -696034,7 +695865,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html": [
-   "3cc3cd8d662c07889f8c0d6d0523709fc28dced0",
+   "b82f84d479aec2db4882711c621ed756786a0f3f",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html.headers": [
@@ -696042,7 +695873,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html": [
-   "e75fd6e7f0cf56cb66bf64f02fe41676c3bdc474",
+   "b8f547403d02d39bae0331ec7557b85841451117",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html.headers": [
@@ -696050,7 +695881,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html": [
-   "0883f6a00cb72f00c46d2971f706a3f3177b7f4c",
+   "27144b999996194708604443b5f94914720d6370",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html.headers": [
@@ -696058,7 +695889,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html": [
-   "7d383a8718090cf9dad0e0688b2a711ce7b6653f",
+   "53e42b69cd6b9c8080481fe365842e8938f9e9d6",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html.headers": [
@@ -696066,7 +695897,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html": [
-   "d6b62169c068ae9486d136d854ab3a6310440f97",
+   "c0de49f4b99416056b491d4a550a823af0ffeb9e",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html.headers": [
@@ -696074,7 +695905,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html": [
-   "2d909b007f92976748c8453b12eadf8dac0744b2",
+   "d27684e3c39d848b32c329d07ed3c34c6844168a",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html.headers": [
@@ -696082,7 +695913,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html": [
-   "9d4f18241d64ab508ca2e710b046a95af46b3125",
+   "b22bc8e75f80ba4e49e48cf802be75578b722f2f",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html.headers": [
@@ -696090,7 +695921,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html": [
-   "c55a1555bc6708f6c07723aa173ef793fbc3f841",
+   "9f2bf170022c638fb43999f41b4e0e94851f7216",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html.headers": [
@@ -696098,7 +695929,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html": [
-   "2f77e61e1a878c109f669d9a82728b949dd74851",
+   "c7382dc23f796fb2a23931fd2cf4406f02fafbb9",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html.headers": [
@@ -696106,7 +695937,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html": [
-   "ce7579e4c5388f5a31289cefc99267cb0e5554ca",
+   "1f6a02c479bea259130748f5d4dbf1e299696830",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html.headers": [
@@ -696114,7 +695945,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html": [
-   "5cc19088d8d95c999c31fce0b8b57082a5bc67ff",
+   "1ee00d1596f9b2b086296e337699a924b9794c5e",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html.headers": [
@@ -696122,7 +695953,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html": [
-   "9b27acf1dac6b5f6a9833d69a6fb80dd13fca34f",
+   "fe2898b64dfd1bebca656fdfaeadd39442d25ee7",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html.headers": [
@@ -696130,7 +695961,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html": [
-   "db2434cdb40d55607d271eb227ed6d014c452580",
+   "95b74be4ea067ec716be723b18bbefc201d2bad7",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html.headers": [
@@ -696138,7 +695969,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html": [
-   "8f7e4439029ac31342da6ac2e34baec37422cd1c",
+   "69cd183fb2ebee60569daa9af236dfa0920b0626",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html.headers": [
@@ -696146,7 +695977,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html": [
-   "1bd2cd5c09bb5c128f806dfc2a64441bc41cd301",
+   "a6eee7dda350babc8dd0989cf4a051af81c15022",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html.headers": [
@@ -696154,7 +695985,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html": [
-   "f96b0bad318da2a75437a3017e12a495386c5890",
+   "3259c33ffc343a21c3294c56f2e646768e5f02b1",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html.headers": [
@@ -696162,7 +695993,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html": [
-   "f69f34751f40ecc2566e7a3d49b149a377f82908",
+   "7f18003e95bce540e79028d6b6bc37acfdf33c5b",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html.headers": [
@@ -696170,7 +696001,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html": [
-   "4d98307f2330fbef2bae4b79b0d08e8d78965024",
+   "03839b5e0793754dd25e3973434c7072f9873b19",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html.headers": [
@@ -696178,7 +696009,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html": [
-   "0faa04f3ae94d32f54d1d4d7426aaf4b78237725",
+   "b0e632dd5554eabef6965db268e5ac3f05dfa323",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html.headers": [
@@ -696186,7 +696017,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html": [
-   "71d259aa249543194f9999fe5221a343beec457a",
+   "e87ee71d406bc226e42c396a2862d419e9c0389a",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html.headers": [
@@ -696194,7 +696025,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html": [
-   "229e4d81a1b690562505eb8640f01e33e0cad985",
+   "c65e7c32f51c7d86f1f11a9177da1ebc116a81bb",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html.headers": [
@@ -696202,7 +696033,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html": [
-   "aa80aca528c859d3d437d6052e557003c5c1a256",
+   "e3e18f2a8668acff0134a0e7925cbcd7a0aabee3",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html.headers": [
@@ -696210,7 +696041,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html": [
-   "fd083ee93d2f2e08fd5fa4a768291efb0088980e",
+   "223003fbede453caab164907c03ccb603078b12f",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html.headers": [
@@ -696218,7 +696049,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html": [
-   "ae41601a66c2bba53eda57c19d7f9173a643b0c6",
+   "9490773aef438e133d2692280100f7adf3317c77",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html.headers": [
@@ -696226,7 +696057,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-http.no-redirect.http.html": [
-   "d8400eb77c5b33eff5d3c25459e93b6dd680901e",
+   "17391c8a0a6980812347802ce4e9daa290fe8a82",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-http.no-redirect.http.html.headers": [
@@ -696234,7 +696065,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-https.no-redirect.http.html": [
-   "2df96ccb120a5ea29f3b5064e9f5177a3ee8ef5c",
+   "109818500603398af2270d65e0acb35bd038f9b9",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-https.no-redirect.http.html.headers": [
@@ -696242,7 +696073,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-http.no-redirect.http.html": [
-   "5ff2faa3b0806ac3b5829aac33aff800d10aaf32",
+   "13197b623862517e0ae5dc6ee4f3fd35a900dd19",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-http.no-redirect.http.html.headers": [
@@ -696250,7 +696081,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-https.no-redirect.http.html": [
-   "882629433fb1b3b2f4071d84984f8173aa5e5a66",
+   "a1a501f6e866c309aa090e88c693f16a708e3de8",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-https.no-redirect.http.html.headers": [
@@ -696258,7 +696089,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.keep-origin.http.html": [
-   "26755b1d5d0fa6ed66fbbcf85f0773f8bfe8f656",
+   "2353cee15305c6d90b058660626b6e872681676e",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.keep-origin.http.html.headers": [
@@ -696266,7 +696097,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.no-redirect.http.html": [
-   "762b2a37d72c6237500c85ce9963ddcd8381b1f7",
+   "dc1667cbc10a6c3b795bc081124a3a1f77580dd9",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.no-redirect.http.html.headers": [
@@ -696274,7 +696105,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.swap-origin.http.html": [
-   "06bec6dfa65f02cc86adc66f4535ee48e52cbbbf",
+   "c8448c546d8fbfd9b99bf708c411c55308a35805",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.swap-origin.http.html.headers": [
@@ -696282,7 +696113,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.keep-origin.http.html": [
-   "b9066e8025ac93478045ac6134163049ea50244e",
+   "de81ab0da86377d8cd779edf27ce7eb43e4cf681",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.keep-origin.http.html.headers": [
@@ -696290,7 +696121,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.no-redirect.http.html": [
-   "e1f40610e19c7fd50d65ac090d54f6434bb491ea",
+   "6cdaa16dff7201c33f2d48ee292af6619cd6397a",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.no-redirect.http.html.headers": [
@@ -696298,7 +696129,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.swap-origin.http.html": [
-   "b9efba712eff4132de249aee0015a72750c6857e",
+   "5f9b73e1fc499570fc7c4ee7ec06e89baeeb6b38",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.swap-origin.http.html.headers": [
@@ -696306,7 +696137,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.keep-origin.http.html": [
-   "d70c493fb207f2191da767d8d31d5bf386d2d09b",
+   "b1ffa0b358c5f33d2d20bbf5ef99bd014890cd52",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.keep-origin.http.html.headers": [
@@ -696314,7 +696145,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.no-redirect.http.html": [
-   "07167183a67c8abec02cd4b8b3e861db58d27d5a",
+   "00640885a6df1a49b4c9667649ecda1856fc6d60",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.no-redirect.http.html.headers": [
@@ -696322,7 +696153,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.swap-origin.http.html": [
-   "7e4592afb2f3612ea94594e4e8ce9968f8392ea9",
+   "0dc59c13e9e832eb67783f9afa710db21c4587dd",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.swap-origin.http.html.headers": [
@@ -696330,7 +696161,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.keep-origin.http.html": [
-   "e17f4011142bb7c6c014e4ca0cd321e282e504b0",
+   "a9b58efea810493c5159a916027e4fc60fc73dc0",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.keep-origin.http.html.headers": [
@@ -696338,7 +696169,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.no-redirect.http.html": [
-   "c1ba382a6e278e0122c855d8ff176350b1329b53",
+   "83280ce93fb5967e334617638d7387371b649fc1",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.no-redirect.http.html.headers": [
@@ -696346,7 +696177,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.swap-origin.http.html": [
-   "ae8e73c219d07a7aa68f3310da0922a178dd19a7",
+   "27e56b984c57ef560adc3ff41cb1323100d96584",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.swap-origin.http.html.headers": [
@@ -696354,7 +696185,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.keep-origin.http.html": [
-   "cc41d608efc0ec25544ad0aa1718f62d033181cb",
+   "d1e79b04b142f7845586afc0b0548bf47cbc0508",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.keep-origin.http.html.headers": [
@@ -696362,7 +696193,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.no-redirect.http.html": [
-   "64a356a7e8c2318ae31423d22c9609d2109e67db",
+   "5dbfc539534969482574631efc87b38d4e5e9e25",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.no-redirect.http.html.headers": [
@@ -696370,7 +696201,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.swap-origin.http.html": [
-   "05ab09007705310c457d9d560b04111b9834da6b",
+   "85c2ba418db55b69ae07619a5e3a0ded4e0368c7",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.swap-origin.http.html.headers": [
@@ -696378,7 +696209,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.keep-origin.http.html": [
-   "74dfe4504316472c3e7ca22ef3942998b9c1f563",
+   "d85ca1cce4572d0e0a0f40605cc7515558a97aaf",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.keep-origin.http.html.headers": [
@@ -696386,7 +696217,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.no-redirect.http.html": [
-   "02a1084e29085a8d24441189aec79d6261485f88",
+   "1b3140596703a41d1463085f585d0d9d90107921",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.no-redirect.http.html.headers": [
@@ -696394,7 +696225,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.swap-origin.http.html": [
-   "60665b949c70a3b7d2cc03f458f939426aed8a8f",
+   "a317d4139ac9b608a07411e3c3b703507d5961e3",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.swap-origin.http.html.headers": [
@@ -696402,7 +696233,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.keep-origin.http.html": [
-   "f520223cf72f82e065ecd1f22c5d99bfaacd17c1",
+   "5e4d877172047dc9c4acb73e4f1f3c21f9395b06",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.keep-origin.http.html.headers": [
@@ -696410,7 +696241,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.no-redirect.http.html": [
-   "544c58d2fd8e749fd21952cb8e5939ba0067c1b1",
+   "94c21f538b7eac9d3b464585d81b9d38a1a3c21a",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.no-redirect.http.html.headers": [
@@ -696418,7 +696249,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.swap-origin.http.html": [
-   "fb80a7297ac6b278af5eeececd99a2e5d46296cf",
+   "18d19be7bde69109e7fa1a2c81eb9c68a8e59be1",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.swap-origin.http.html.headers": [
@@ -696426,7 +696257,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.keep-origin.http.html": [
-   "9795a487b6b67e4902046ed063b7f0b4ab82dc56",
+   "2eee2a663cfff6e4f886493eb360e6bfff39043e",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.keep-origin.http.html.headers": [
@@ -696434,7 +696265,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.no-redirect.http.html": [
-   "abcbee94c3bb9cbac11f4a51ea405d14c5ea8e02",
+   "ed3000738234b6757699e2eff5fec09065db212f",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.no-redirect.http.html.headers": [
@@ -696442,7 +696273,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.swap-origin.http.html": [
-   "c8102949ede5c08aba34b972572273f163623ea1",
+   "21144a59790838a09fe06c8b697f8568b09461e0",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.swap-origin.http.html.headers": [
@@ -696450,7 +696281,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html": [
-   "657908de15e532fd48da2315b3533e259601a4c2",
+   "5289d6cad0573f52a4815176f13b207fb29ebf99",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html.headers": [
@@ -696458,7 +696289,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html": [
-   "f17fc3a764c9d867625041da5cb5fa957d2c02f8",
+   "d5c7cb27d19683295f2af1ef35e7aa3f8deb097e",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html.headers": [
@@ -696466,7 +696297,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html": [
-   "4c8d0e36e703babf70bcd0b9ec53f8a52ae1a7fa",
+   "c98ef613a08402823a068733cbd300f4795477c7",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html.headers": [
@@ -696474,7 +696305,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html": [
-   "fced53dff4313865b2c6f92d99ff04dee329d3c3",
+   "a95d09c8870f63b392050664fac6cda75287842f",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html.headers": [
@@ -696482,7 +696313,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html": [
-   "b22aea4813ae1f69e7f9c591abf7fba7f26fabe9",
+   "587c5bab12174eee1cf6a1a5e873790b50815e54",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html.headers": [
@@ -696490,7 +696321,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html": [
-   "644c8433081e500f51bd837c040e15b3083d48b0",
+   "274764fa2c235336bccdc197c7266b6a4d8af2ba",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html.headers": [
@@ -696498,7 +696329,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html": [
-   "94a08ebbb5a58d066a631512069416a0ffb115cc",
+   "70c02b2d16b1ad8defda96347a140c53b0d81e73",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html.headers": [
@@ -696506,7 +696337,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html": [
-   "66f91396d96669bf8b7da4ed86730125a3d51799",
+   "427458a2e793b7ff7b1bbc47ea2a23e7fce90120",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html.headers": [
@@ -696514,7 +696345,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html": [
-   "b7fa7c76ea609ac2f255d04bfcdffaa2e5a543be",
+   "8028f64fe45efe37da64b67825b4ee795ab707eb",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html.headers": [
@@ -696522,7 +696353,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html": [
-   "e5b324937629b23fc7dcbe328d1e5b3cbd6ef958",
+   "d408826f1f4a98b5094c6f242a8d181ea017b3ab",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html.headers": [
@@ -696530,7 +696361,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html": [
-   "700e6caeafe15dabe1e528d2c52c33a7a77396ad",
+   "b19cd0eedf160193a7ba3f0058c0d34cb311b89b",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html.headers": [
@@ -696538,7 +696369,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html": [
-   "287f7241a6335991bd743f015816593093d422df",
+   "bf9c77a8bc980082c009b93f440dece020049d04",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html.headers": [
@@ -696546,7 +696377,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.keep-origin.http.html": [
-   "265dfdb2939bd5137f974f4a5d2eb5cfd5a4fa7f",
+   "e92926b38b00c789dba77ab58ac98b7e2c13728e",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.keep-origin.http.html.headers": [
@@ -696554,7 +696385,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.no-redirect.http.html": [
-   "60a610c883b24f3a03a11692da05d2fde6526183",
+   "74d7ac544f51090ee57e5d033f7f0b3afcc39697",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.no-redirect.http.html.headers": [
@@ -696562,7 +696393,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.swap-origin.http.html": [
-   "249a08c37923977080dfc8ecd305a4970c61c9fc",
+   "4bcaf1209248e1f58eadc963e58980979e49e6af",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.swap-origin.http.html.headers": [
@@ -696570,7 +696401,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.keep-origin.http.html": [
-   "fea15e881c67214b7dba7269e67d343c2c71d493",
+   "50c9cf561263a8b3461f9634190cf80d257ffe88",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.keep-origin.http.html.headers": [
@@ -696578,7 +696409,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.no-redirect.http.html": [
-   "a0197fa970783f80b37fa2ce96099bf9afc51255",
+   "db50dc6d1119f6a65749c4393270122c519352d6",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.no-redirect.http.html.headers": [
@@ -696586,7 +696417,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.swap-origin.http.html": [
-   "53bd0cc76485c6dc470e19acb4b4a8e08b6f40eb",
+   "7cfeb5c009337eb359f8e3bb1f55122821387136",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.swap-origin.http.html.headers": [
@@ -696594,7 +696425,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.keep-origin.http.html": [
-   "be4c36650f3929d77b5d4d641e24e5982b8422af",
+   "b549702063cd9a4de1321c169195296d81029bf5",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.keep-origin.http.html.headers": [
@@ -696602,7 +696433,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.no-redirect.http.html": [
-   "50e95a73b1337e641ea30e73aef594079ae5f8ce",
+   "c0c2fc2af422e90d3953b2191eb5ff582e57b88b",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.no-redirect.http.html.headers": [
@@ -696610,7 +696441,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.swap-origin.http.html": [
-   "10d30d1f616b0313ed24dc9a4801d7f1c4a8a1a7",
+   "dba717bfa947f2144aa54394a6b6b3c4f428cd7a",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.swap-origin.http.html.headers": [
@@ -696618,7 +696449,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.keep-origin.http.html": [
-   "d4c1c0c94a9c2f22f3f12a4660d0814b26fe6b25",
+   "c9e87079833130200427d07fe8f5a7fcd8ea110d",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.keep-origin.http.html.headers": [
@@ -696626,7 +696457,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.no-redirect.http.html": [
-   "0b9510c6377f540ff0861e5a1117f79b0c952540",
+   "f6bce1c74248850eddac08f993024569500fab3e",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.no-redirect.http.html.headers": [
@@ -696634,7 +696465,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.swap-origin.http.html": [
-   "59aa240ed3358e7dad0c88f4b4f54ebad94d18c6",
+   "ef2ae0cf9d0faed6044fdac01e52c486f5f36dcb",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.swap-origin.http.html.headers": [
@@ -696642,7 +696473,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.keep-origin.http.html": [
-   "73781b6bcf9d7df341e945e0b9e4d4a2ece3030a",
+   "28729ca99165b81802417201cdb4f2c100ceb0e8",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.keep-origin.http.html.headers": [
@@ -696650,7 +696481,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.no-redirect.http.html": [
-   "2f5d857e4da9505396deeb317083c2ea381f063e",
+   "be5637f2fc5ffacd514b99be5fca33672c08c08c",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.no-redirect.http.html.headers": [
@@ -696658,7 +696489,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.keep-origin.http.html": [
-   "610a8f4262fc62b7e5d2bdafb1dc0a9bcc2558d7",
+   "a7b5b0136e7ef131a7423bdd6ac934fbbb511840",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.keep-origin.http.html.headers": [
@@ -696666,7 +696497,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.no-redirect.http.html": [
-   "1ab66a526ff06ac22aff4ebc8133c3c78f6aa5af",
+   "695db86364b8e27eda09e695db240ada4ff0eedf",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.no-redirect.http.html.headers": [
@@ -696674,7 +696505,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.keep-origin.http.html": [
-   "b3f8bff71956b986fa178f7a0d7e5b22e88d36f4",
+   "406ac90830d788b5cb6678bcccb7969e143ae040",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.keep-origin.http.html.headers": [
@@ -696682,7 +696513,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.no-redirect.http.html": [
-   "abf8e77cf4def5d870c732cb1ef0ed23699d56e9",
+   "b88f3397fd2035eee0618785b63408fd314f1dc4",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.no-redirect.http.html.headers": [
@@ -696690,7 +696521,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.keep-origin.http.html": [
-   "ad937bcc0c2d00dc71595d98964211a34bfe98aa",
+   "e40bd4e342cc5e030f04ae00fcd37b288ecfb66d",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.keep-origin.http.html.headers": [
@@ -696698,7 +696529,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.no-redirect.http.html": [
-   "8c6721e53e440e1baf091a74451811d43c5bcef1",
+   "c49c3dc09cba560f1f795ee97a1d0aa79efc37b4",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.no-redirect.http.html.headers": [
@@ -696706,7 +696537,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.swap-origin.http.html": [
-   "e8564ee685da933c7947a99a6d79ac0b392f3d3b",
+   "2b7fb9ffc12770fc638bf6255a0a1405cb70475d",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.swap-origin.http.html.headers": [
@@ -696714,7 +696545,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.keep-origin.http.html": [
-   "b3b580d9ea7f51bf4195e0d34c7930a38e2f467d",
+   "8f72f1cffe314e2138ffefe4af6512e104eb88c2",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.keep-origin.http.html.headers": [
@@ -696722,7 +696553,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.no-redirect.http.html": [
-   "53ef86a4485381c2da361e83e858fa282cc67084",
+   "ffe36051bda254cc439956c8adb6ee088e6bd390",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.no-redirect.http.html.headers": [
@@ -696730,7 +696561,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.swap-origin.http.html": [
-   "d206f41e090917f2c5cdd7ba1abf1a550e8e5b18",
+   "b5d59d53c94d49ecebed2c39824cafd1caa607bf",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.swap-origin.http.html.headers": [
@@ -696738,7 +696569,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.keep-origin.http.html": [
-   "38d101103a4327144e3b863e22ce141c60e91f6d",
+   "08ebb4a92fd66ab94e9071ad0aa259166f8f64be",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.keep-origin.http.html.headers": [
@@ -696746,7 +696577,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.no-redirect.http.html": [
-   "39870f731d56f3e976e20dd15f5aca22c8579b4e",
+   "e7871b2914cbbc87ba6679b2c43aa791faba9d4a",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.no-redirect.http.html.headers": [
@@ -696754,7 +696585,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.swap-origin.http.html": [
-   "4d7c63bde8cd91a517502be30c017e0460085d4b",
+   "ce15f91f296332a41c314b5bc30070abcc0794ad",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.swap-origin.http.html.headers": [
@@ -696762,7 +696593,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.keep-origin.http.html": [
-   "f6402c403f7347cc1f40cc547682aa28f9397a60",
+   "99f3a50e23f69cea2cee35c2b6deeaf70b025597",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.keep-origin.http.html.headers": [
@@ -696770,7 +696601,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.no-redirect.http.html": [
-   "d4171cd2410c13396645e48fd456a64ff89ff74e",
+   "7ec67798b2137f4c6c52cfdf6da1c6c10284a796",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.no-redirect.http.html.headers": [
@@ -696778,7 +696609,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.swap-origin.http.html": [
-   "4503188ed0246fa64fcbb589708a29ddb6575718",
+   "5aab485f6b0d64268e2f94f1a6c24438598e324d",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.swap-origin.http.html.headers": [
@@ -696786,7 +696617,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-http.no-redirect.http.html": [
-   "5c816eb0a44aaa9eaa954e6cb3968492cc326386",
+   "8bd36a5aa4818315fd5d69d7c8b30ac5bba636e3",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-http.no-redirect.http.html.headers": [
@@ -696794,7 +696625,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-https.no-redirect.http.html": [
-   "96d4eabbefa73d58b400df09baa686df21d3e8f9",
+   "9950fc28b3d7534f6a2fd20936e94144e4ee9397",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-https.no-redirect.http.html.headers": [
@@ -696802,7 +696633,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-http.no-redirect.http.html": [
-   "37f12599a1c12225788f286736414549dbec4959",
+   "ab02dc0a6657938953b6c5c945d935eb55103087",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-http.no-redirect.http.html.headers": [
@@ -696810,7 +696641,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-https.no-redirect.http.html": [
-   "71313a690fa200bf0d3c1e6c297eabb46b9615a7",
+   "dd05577ab9dbfabd2c8af1e30f86aa9d4c35ded4",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-https.no-redirect.http.html.headers": [
@@ -696818,7 +696649,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.keep-origin.http.html": [
-   "83475de46f560cdd1840f9555bc1e928ce25514a",
+   "ff238394208b8b1bb7d336eb6d2dfdd1e6680ff3",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.keep-origin.http.html.headers": [
@@ -696826,7 +696657,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.no-redirect.http.html": [
-   "4bd1b375963ef7a6a5b1ce3a07cd7545fe3d1d12",
+   "e42c5761ed7c9c71867accee62a43b2b3da2ff57",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.no-redirect.http.html.headers": [
@@ -696834,7 +696665,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.swap-origin.http.html": [
-   "832acef5b5f4d8304f1486e68ff588c0b1441db6",
+   "126f54cb14884f0f66f2cb51af2388ffbb018f43",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.swap-origin.http.html.headers": [
@@ -696842,7 +696673,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.keep-origin.http.html": [
-   "c1a9a94dc1239972ec72ea05e324b878203a035d",
+   "c09c47338610c74bb21510c204e83023a89cdef4",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.keep-origin.http.html.headers": [
@@ -696850,7 +696681,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.no-redirect.http.html": [
-   "f77455b2703615fa9d5b8789b6950c041f3f630d",
+   "f7a88fb2c30ea5191aa8b2f9cca0b626f6de9bea",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.no-redirect.http.html.headers": [
@@ -696858,7 +696689,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.swap-origin.http.html": [
-   "d1060c6544e8a78f7aa9916528c763483ea8b016",
+   "4dc3dcd9e4b22b3524b696013c61b7d370616550",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.swap-origin.http.html.headers": [
@@ -696866,7 +696697,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.keep-origin.http.html": [
-   "e29af406d7335d30ba2c5b507a23a08ab533f027",
+   "950e6e2196594b9483c944ca83e1737208fcc71a",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.keep-origin.http.html.headers": [
@@ -696874,7 +696705,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.no-redirect.http.html": [
-   "bcb14d5902173d2eb08aa0599ed0180a6d1511fa",
+   "48ea74171fe9d5480e4a7ef60a5da8b421a3b084",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.no-redirect.http.html.headers": [
@@ -696882,7 +696713,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.swap-origin.http.html": [
-   "b7b24f5c1068f6bd6842cca5b72e91f7dd1569aa",
+   "67cdcec01304c6e97c29f4c18f511ee815bb53c5",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.swap-origin.http.html.headers": [
@@ -696890,7 +696721,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.keep-origin.http.html": [
-   "81493ee9d360da2cf62ac27219994b2ccc04a0bb",
+   "d909cf5e125897eabb1948ce8048a31f687feeb7",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.keep-origin.http.html.headers": [
@@ -696898,7 +696729,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.no-redirect.http.html": [
-   "6a29be40643bab6a1d310838c67e477345bf53bd",
+   "ffec6a01d82762ef2892e8dadfa88a67eb1e582a",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.no-redirect.http.html.headers": [
@@ -696906,7 +696737,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.swap-origin.http.html": [
-   "87c56c603e6ff4d9cc82848b18614fb3c51b1814",
+   "66b00d6e08c0f98aa1dd13b23d6e317795b02f02",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.swap-origin.http.html.headers": [
@@ -696914,7 +696745,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.keep-origin.http.html": [
-   "ccff3d5edac4a7ce65ea3027ec560c62e91bd6e8",
+   "71149cabafad7326fbb5f93a83a081269f79e633",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.keep-origin.http.html.headers": [
@@ -696922,7 +696753,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.no-redirect.http.html": [
-   "5c34320a6a614877694d028e115e19b49be175d5",
+   "1ec17228f36c0c7e422a436624d2460c474631af",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.no-redirect.http.html.headers": [
@@ -696930,7 +696761,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.swap-origin.http.html": [
-   "be3ad9595099d53b478f4bb6df0eb430e7cf55db",
+   "3df617bfcd79ce2d9359aa1c494857ec42f5006b",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.swap-origin.http.html.headers": [
@@ -696938,7 +696769,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.keep-origin.http.html": [
-   "4b15fa4a5f4f93c6df3e88607b83b5e63cb321db",
+   "dc644137b3a739185b274948cd55e473c79e00b4",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.keep-origin.http.html.headers": [
@@ -696946,7 +696777,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.no-redirect.http.html": [
-   "e385c68fabf73bf123a6bf7a905940bd053d827f",
+   "79b69cb07555ca421d43ea5b4501304a8e2be7ff",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.no-redirect.http.html.headers": [
@@ -696954,7 +696785,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.swap-origin.http.html": [
-   "2d1b833a89645c83dff3e233af31d8b6ad13464f",
+   "4b465a4934aedae7fcf2a51446f282edca2c8185",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.swap-origin.http.html.headers": [
@@ -696962,7 +696793,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.keep-origin.http.html": [
-   "1b0b5dfa76e74706bd107a2254fb457bbc2ddc48",
+   "ed1e4d412af0970a5196aa750ea0446781b5d0d6",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.keep-origin.http.html.headers": [
@@ -696970,7 +696801,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.no-redirect.http.html": [
-   "2359faf8082600590475376f09b27d6fed5fbdfc",
+   "bb569428037c4a14263ff4901a5679e50e146731",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.no-redirect.http.html.headers": [
@@ -696978,7 +696809,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.swap-origin.http.html": [
-   "628bf7c935737931cbda4c2e249aa47df4a09862",
+   "f87100f6884e8b62f6b35750f38a6c15a3e5c2ac",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.swap-origin.http.html.headers": [
@@ -696986,7 +696817,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.keep-origin.http.html": [
-   "ff53d09be61e72b81e122ab6d151ff34776a3b56",
+   "204145629c2bb82fcbe9ae209fa5ccaf6cb6aab6",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.keep-origin.http.html.headers": [
@@ -696994,7 +696825,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.no-redirect.http.html": [
-   "4e5d310d933335cdb98711e3db1362c15192d597",
+   "0edb5bcf002f77343cbc978d90d6154f97e8067a",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.no-redirect.http.html.headers": [
@@ -697002,7 +696833,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.swap-origin.http.html": [
-   "8a2aaf9a7f06ad5c5ebdc18f2d567f6672d97243",
+   "91528cb34a980bdf308f45428fa5fd3fdebb9883",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.swap-origin.http.html.headers": [
@@ -697010,7 +696841,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html": [
-   "13d00be71d25e994a8cbf39106bfb9cae82638f0",
+   "02d8620cf1aacafcf71f0ba8a3828ee5b0c3d155",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html.headers": [
@@ -697018,7 +696849,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html": [
-   "b391ba07f32214342e9a871e2252d3029a0af7e8",
+   "2c3b70e7bdd65f1363f5b64da91c18bdfefb3b63",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html.headers": [
@@ -697026,7 +696857,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html": [
-   "f0a3a42cfadb6a6b155f89da12eea79734967247",
+   "d9c3e50948d7219e188c910b59a0f1c2262696cc",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html.headers": [
@@ -697034,7 +696865,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html": [
-   "897a84e2e26ac1a96fa0f97e3fff587a4d33e289",
+   "d5cc8bd030955565a6336854babda124ce2db4bf",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html.headers": [
@@ -697042,7 +696873,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html": [
-   "99cad1b485699c8d53f47efda32688417bf78ca0",
+   "4fd10e8950afea75d6e7c6409a2011ec45bc0fe3",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html.headers": [
@@ -697050,7 +696881,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html": [
-   "42c2f224d5bc1ce432b2b626ca7ffa192048a076",
+   "76df80d59b041efff766d9a775928438b97ca523",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html.headers": [
@@ -697058,7 +696889,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html": [
-   "75cb2d163e17fc0983e34d52177fa7e2175b3974",
+   "af4a533a048a01c6794ae8727ae7b551eb7a4e29",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html.headers": [
@@ -697066,7 +696897,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html": [
-   "8b37e8fc3939ec41e069ebf913c2ffd9c0f42532",
+   "eaccd60742da33eaca21b26968882fecdb3af328",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html.headers": [
@@ -697074,7 +696905,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html": [
-   "f8e6582bddfcdfdb4fed3b529d966a752c1fa1d7",
+   "13963b209c9272136cb922b2d47d37afa26c6697",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html.headers": [
@@ -697082,7 +696913,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html": [
-   "77b58ce195d7c74452951703c4e1151a14f78a52",
+   "e35988d7840fed1eff562eb5e9c3d5b36f813ca9",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html.headers": [
@@ -697090,7 +696921,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html": [
-   "963f8a370a5fa900bd2b8fd7628b7dc8fdc0444c",
+   "9817f03974937604865e347477a96bc5cb75fe3d",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html.headers": [
@@ -697098,7 +696929,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html": [
-   "920b578cdd6d65c57c6e4849bde8261bfbd5fa19",
+   "3a1d7e3577603b0addf937df99d2bb7654dc6dd7",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html.headers": [
@@ -697106,7 +696937,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.keep-origin.http.html": [
-   "26629a29c6d1ce567ecd474270f554fa1be13991",
+   "e397cf3d436231858d404410d5808c4df71d6097",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.keep-origin.http.html.headers": [
@@ -697114,7 +696945,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.no-redirect.http.html": [
-   "98da011b1092832eae48c8779bf998bb003b9547",
+   "8b2ace56b5a16adb17436a7ffdb4918c90f74e9a",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.no-redirect.http.html.headers": [
@@ -697122,7 +696953,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.swap-origin.http.html": [
-   "141f7f55e84d337870f9c2e1e0941aa8ae82a3da",
+   "5dfcc70a1a6f10b7f56d3b0373715afd334338e9",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.swap-origin.http.html.headers": [
@@ -697130,7 +696961,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.keep-origin.http.html": [
-   "b3cd9332d2fcf209a2cede1faefd656e030efe32",
+   "7b2e0b662fb4231c7683323aa594c795ab666dce",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.keep-origin.http.html.headers": [
@@ -697138,7 +696969,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.no-redirect.http.html": [
-   "09f9c7e1b011562627620871a22ad40d95ce65ae",
+   "9a235e6cee4c374ae767ffd23e471f59e48993c3",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.no-redirect.http.html.headers": [
@@ -697146,7 +696977,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.swap-origin.http.html": [
-   "4cc455c2f5b35e05afbd05b38b1114be91976963",
+   "5ab8985eb1e2865f5dd2b72621d4d1b00f93a8bf",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.swap-origin.http.html.headers": [
@@ -697154,7 +696985,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.keep-origin.http.html": [
-   "60519bc6e8bef38cfedcf506d8aebeb7edf23895",
+   "73b8c926881c19ffea46571d41bd4630e2f8eb4e",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.keep-origin.http.html.headers": [
@@ -697162,7 +696993,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.no-redirect.http.html": [
-   "b1a2dde0e7d6748832ddf34af5a6874b41e2b164",
+   "3c0ae426bf9e14ff495b1591135881641af5db73",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.no-redirect.http.html.headers": [
@@ -697170,7 +697001,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.swap-origin.http.html": [
-   "cc741df381a43bdc98b6e634e53792c3ce7d2fb0",
+   "68142ef041b99da8e6dcf063f1b4a497949de3ae",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.swap-origin.http.html.headers": [
@@ -697178,7 +697009,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.keep-origin.http.html": [
-   "0b825b17e57f49260abe200d9cf73a58a7545c0c",
+   "c9404817899c2660805d905c47b52099d0306164",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.keep-origin.http.html.headers": [
@@ -697186,7 +697017,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.no-redirect.http.html": [
-   "36a19e73da1cedfc5d16d78b70441d0ab0e3ab78",
+   "cfdbf2cbf7a20e70e5bb0934f6e51812d5777160",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.no-redirect.http.html.headers": [
@@ -697194,7 +697025,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.swap-origin.http.html": [
-   "18013980f38600fc8698bfb52644907352d00370",
+   "2ac4853fb91992153efa9c164f26cc29e65af9be",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.swap-origin.http.html.headers": [
@@ -697202,7 +697033,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html": [
-   "214d4f5a46bbe4576f9fd6a1128bb45b728ac6e7",
+   "49d26e679fc97ae21ec7e95c7186449984a79faf",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html.headers": [
@@ -697210,7 +697041,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html": [
-   "2d86ea85b99e699dc06721e3b0dfbbcde399f6cd",
+   "5c0f3f2b5ab5f008402ffeaa18cae8cc9dc3c0fc",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html.headers": [
@@ -697218,7 +697049,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.keep-origin.http.html": [
-   "16d0292c82f73b29da67b5e1e297bd86849619f0",
+   "f9ae9653951c6b8b54aeed8abe5487d200eaae20",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.keep-origin.http.html.headers": [
@@ -697226,7 +697057,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.no-redirect.http.html": [
-   "6b740f1184d32046df822c4a87a7e2b627e0c951",
+   "09fd2f147563ab032aa03b4bfaf1b3f4e7a00dc6",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.no-redirect.http.html.headers": [
@@ -697234,7 +697065,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.keep-origin.http.html": [
-   "0dbd2c92df8a35c33185e52fb3eff2aad7926e94",
+   "62948a2ebf7c3fce876b0b2b06936018b8846519",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.keep-origin.http.html.headers": [
@@ -697242,7 +697073,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.no-redirect.http.html": [
-   "9de4cbc6dc00c4f1d294c09953761deb5da73d9f",
+   "67b2779869aa40131c75cf44ba02ef9325af77b5",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.no-redirect.http.html.headers": [
@@ -697250,7 +697081,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.keep-origin.http.html": [
-   "603a9aaa5f5e9b37143baf5b02f64f31eff1ef5c",
+   "f74607901dcdfece910a5418e1b92e45b6e33f18",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.keep-origin.http.html.headers": [
@@ -697258,7 +697089,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.no-redirect.http.html": [
-   "fc55fed0d04c67667be8651fb583dd081224963a",
+   "28080172302293d886fae82539581e50952dc35a",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.no-redirect.http.html.headers": [
@@ -697266,7 +697097,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.swap-origin.http.html": [
-   "412e37f10ffa1d64f93a73805828f3843e4ff0f5",
+   "cdd0e6d3685c841036712b24704c53f79111f471",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.swap-origin.http.html.headers": [
@@ -697274,7 +697105,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.keep-origin.http.html": [
-   "dbd033f7be46dd08c1759ed98dbf4a809feb2b3b",
+   "d931133baae8849a4859ad4684a62750d11932de",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.keep-origin.http.html.headers": [
@@ -697282,7 +697113,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.no-redirect.http.html": [
-   "e69f76eab6c04d80f50f162710be893b7e6a00f8",
+   "e1d294af2d0efd838d4be050fa942a136430e6d9",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.no-redirect.http.html.headers": [
@@ -697290,7 +697121,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.swap-origin.http.html": [
-   "36348b46a2052f13564ba7bfa10467e97b360e26",
+   "81b2c34a3a36a13e040b4ac7683f1d5742c774ae",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.swap-origin.http.html.headers": [
@@ -697298,7 +697129,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.keep-origin.http.html": [
-   "bab18f65504e961e289f85b8f17235c09694b326",
+   "7f64858b85a634f9b40b1b1949fa4b083ff0f2e1",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.keep-origin.http.html.headers": [
@@ -697306,7 +697137,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.no-redirect.http.html": [
-   "ad9fa9f1cad2982d81f0bc2cf3cb0d8480360400",
+   "4bcbc0ddbda5605a217a6e4198a2b9f8348eed6e",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.no-redirect.http.html.headers": [
@@ -697314,7 +697145,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.swap-origin.http.html": [
-   "1be3fa02a7c63f5d192d05a19d5a159b66bd5c94",
+   "895ca00acc026fe7aaf9c26e592f70a8a69ab2b7",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.swap-origin.http.html.headers": [
@@ -697322,7 +697153,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.keep-origin.http.html": [
-   "6e367a23417f50dfb94022c526ec21078946b4ff",
+   "a12c1c9e70ba6027571932375823421c2c43879e",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.keep-origin.http.html.headers": [
@@ -697330,7 +697161,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.no-redirect.http.html": [
-   "0bd6a160c7d23a38cbd660faa57e10023cc45bae",
+   "eb85824ac9ed5d0e991209442352d155f37c40a9",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.no-redirect.http.html.headers": [
@@ -697338,7 +697169,7 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.swap-origin.http.html": [
-   "3aa3f884ef46f693da0c71e16867766eb5bf7d8a",
+   "0edf4ff90e0dfaa55acf881f7f51ae5299c61622",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.swap-origin.http.html.headers": [
@@ -697346,4743 +697177,4743 @@
    "support"
   ],
   "referrer-policy/gen/top.http-rp/unset/a-tag/cross-http.no-redirect.http.html": [
-   "7b76180b1280f6a33125b03fce289bdc75644953",
+   "911f16d5eb0a380d9872009e72c1dbf37785ec05",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/a-tag/cross-https.no-redirect.http.html": [
-   "ead7efc96337c66ce0e2eee97bfde5fe0fe6194a",
+   "9d8064ff8824f76d39783e5ed33b44cd4549bdef",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/a-tag/same-http.no-redirect.http.html": [
-   "0350e03597cafb7582f73dc588d416ff72bd1e4f",
+   "cdaf18c1d258ca92b0003c73992750caacb0f171",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/a-tag/same-https.no-redirect.http.html": [
-   "be8155abc71a036396917321e18c17726eb740b2",
+   "9a6c2b43a8b2586909c04037ac3f739f48f8f28e",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/fetch/cross-http.keep-origin.http.html": [
-   "d6dbf7c38f52cfe136a313a225452e25fe9582d2",
+   "7fa2a77de9ecab2667301d865f73b507f56ce2e7",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/fetch/cross-http.no-redirect.http.html": [
-   "d6b7b1d4b2303aec7eaef620e9573a827b4f6d11",
+   "bbf1496d07d2e4f04840b7cca2b2f867846b2d10",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/fetch/cross-http.swap-origin.http.html": [
-   "228bac96566b97d482a3a0c209c8ffd23398be51",
+   "989c7934ed037417ddd3b30cfb0a1c02a78b427a",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/fetch/cross-https.keep-origin.http.html": [
-   "23a5dc696034e3ed1b4aa9612befdde70ceffa32",
+   "7a596e7f8067e35bb985d23f7aa9aa31432538ff",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/fetch/cross-https.no-redirect.http.html": [
-   "2b950c4a6817da9151e8257f3dd0a9ebfd733253",
+   "bba5c2a55a730992c6d35c94a3459f4f6347b276",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/fetch/cross-https.swap-origin.http.html": [
-   "68d8dddf59d0f84badd8a98bfd25f1123128676f",
+   "867e64067baed1620991e2d78539b88775bbba65",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/fetch/same-http.keep-origin.http.html": [
-   "68a2919245a5a9af207ff6e133ad2ef2b79663d8",
+   "5e004ab58926c21d8a814fc0d6c99f3aa5f2e390",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/fetch/same-http.no-redirect.http.html": [
-   "9786e115f4534b5e06316dd5f66979ea1331e25d",
+   "94176020e8685afc8595bf5f877d23194f98bf4b",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/fetch/same-http.swap-origin.http.html": [
-   "aeb97a127123950647fa69cb3165a78046a741f3",
+   "82b9de5fff3968b9f7a48afab8d69d3d33849cdc",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/fetch/same-https.keep-origin.http.html": [
-   "27bf0fb382512b9a19f1b45c65938ae91d7b2520",
+   "20be1f2f6568282fc23a9ebd44aa84f7582c68ac",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/fetch/same-https.no-redirect.http.html": [
-   "f2de2eeabfa438844b97856c9ea1376e1364524c",
+   "244623b424cd74ab05eda215488f391874e38f2c",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/fetch/same-https.swap-origin.http.html": [
-   "2f059b49d6c0a9dcc9d9acb82472051ac2e71ce2",
+   "fbcccb86bfd334a720399e7c0ca4b701326c2c14",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.keep-origin.http.html": [
-   "51b796faff483aa283c8dde74d464f1d3bcdb66a",
+   "d2ea91e2d70ce9023879fba6c5e8378166966a7f",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.no-redirect.http.html": [
-   "ae910ab09dbac0a7d233294f4181b11f77592fe4",
+   "1ce5e1167c3b1695e83ec05a38d8e5ef8e067910",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.swap-origin.http.html": [
-   "6b96a09c17948d56e14b645c43754af50052bfaf",
+   "afdfbaa439267de54b580f58e57906c942e5deb8",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.keep-origin.http.html": [
-   "89eb976029d84b8887f4d299b7b1c6c378a15f4c",
+   "76040acbbdd655cd789937a4b9d058041bf77407",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.no-redirect.http.html": [
-   "d099040c32c19bfe2fcc12a459f28a6d60c798ca",
+   "0f31d22b62675ea623ab185463abb80a81d45f27",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.swap-origin.http.html": [
-   "026635498c02397a0d2b8666219fc47bede7b310",
+   "41626c4de9873079e97655e625f6a90fdeb940ce",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.keep-origin.http.html": [
-   "a88a0727bf671469a2d33f99c869a0d02fbf8f6e",
+   "a0252bb469879486bb8deae6d7b0bbe4386755f9",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.no-redirect.http.html": [
-   "04cc2e35ebcbf0061e62dab71a1ae4279642ec57",
+   "1c1193812145543a853ae0e1314a8d596c906376",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.swap-origin.http.html": [
-   "c877963cb9afd648229b8b5ff6179bd0fb2cba4f",
+   "764ffe53f4bb290ef7057479a85abcd05f4e43b7",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.keep-origin.http.html": [
-   "5a1af89398747e0efdf4265d8b9b79ce91cbf1df",
+   "5cc8685d8d72503700921fea1114a382cbdd7efc",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.no-redirect.http.html": [
-   "4c9fb03cd2b73cf193f3434121ef236c4353def5",
+   "4743875860b357c35d92cc67cfce9d9c6fd61682",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.swap-origin.http.html": [
-   "d9ab586df6e6e3aa449ae6fae082f670c9b9612b",
+   "ca673fd821e153a13c7e6ee24e0dd6de4f718036",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.keep-origin.http.html": [
-   "9631d810efd2c0b2d7127ce351e37a4b5dee9d8e",
+   "b9ee419b2c510ab4b97057a424ea8f41632b7469",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.no-redirect.http.html": [
-   "6e03cdab423332817281306be15546db7fcbbbe4",
+   "95e968cd67d788beebcc10764623e37ee9c580e7",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.swap-origin.http.html": [
-   "f3ccb1f50425bd99ef3a968dfa6d59571f0c4db3",
+   "8eac9af58b6e08eb38826bafd7157ddff927200a",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.keep-origin.http.html": [
-   "27266df1e4758381e35767c4ae1c5a6852eb6947",
+   "6483c72a3e2b719bf3266b411e6e74bb64709200",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.no-redirect.http.html": [
-   "7299286879b5e7e3204f8b1e885cf13dfca3d1d5",
+   "3f32c6b4f9c7d8505cd5c03761117797e655f0c0",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.swap-origin.http.html": [
-   "53ae37b0509db25a84feeedb79397677251f6cc1",
+   "1dfd817473f4dfa606510cef5ea76fa62882b844",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/img-tag/same-http.keep-origin.http.html": [
-   "bb0fc8062f5cafe2f16560e03c5136b27e9050d6",
+   "4c6a93cfc28cfb45840312637e01ad2b705afc19",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/img-tag/same-http.no-redirect.http.html": [
-   "6d4ed57e23c2fb495d56d641c3316bfe9060521e",
+   "c0411dc5651e9986d6baca189fe8f867d780b7ba",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/img-tag/same-http.swap-origin.http.html": [
-   "719a6354f27201757448d7b00d76450888ff269f",
+   "d67e02ba7e4703256c39009d884822f07a2279bc",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/img-tag/same-https.keep-origin.http.html": [
-   "c39fdd14a4409a3f9cecc4a616cf55460f1c870c",
+   "6e90c0f4b8c0e21fab3eeda8cf8679c8b4c64190",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/img-tag/same-https.no-redirect.http.html": [
-   "d594f8b75eb7c4c150e52cd933152f0064d67ac6",
+   "9f91b2485eef9d3a97ea0d8b0b5e4ba4c6de0d84",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/img-tag/same-https.swap-origin.http.html": [
-   "2fbe12fe8a8292d11e8d95a0a8ea9c99d44fcfde",
+   "138f3358bd726c42329dcbb1391d714fe8cb723c",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.keep-origin.http.html": [
-   "2a587ca4b11f08295a64404098925575b885f7d4",
+   "78ece0b19b8cd9e61059750f5a64d1f1d2425f64",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.no-redirect.http.html": [
-   "d0be10f9bcd922d7c712c91f8aa63e88b01bffbb",
+   "7a5879d9125157403db4d50ae6a9e71890e2d8fd",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.swap-origin.http.html": [
-   "85414f14de313adf52a8b1c0dc5090ffa43b64db",
+   "9d3381830e49b0000fb45285c87f81def3abbca2",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.keep-origin.http.html": [
-   "ec3dcdea3417d91b5dc59a42982a15c285d9b3b6",
+   "55e030b820dc91e3e8af2e662a9756b88af25042",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.no-redirect.http.html": [
-   "196770f8da688af4acbd0cd2fcbc233efae50cb4",
+   "3827e7a5c51bd00e844053aad53d80472fb2165d",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.swap-origin.http.html": [
-   "151d87662ab606881613e0cf9e06de47b15612d6",
+   "f767e02e2f049824443ec1b8ac45bd4a99b0f2d7",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/script-tag/same-http.keep-origin.http.html": [
-   "c186fa19693386ae0dca6d05638ef11b91c6bed4",
+   "0c2128b8c165e4cce9420cd51ed0b8a4d9a1c5fa",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/script-tag/same-http.no-redirect.http.html": [
-   "d0c49af446fe311605b061700e8a0582acdca03c",
+   "56ba08f9a4b033c831e255ecb57291763edd6ec8",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/script-tag/same-http.swap-origin.http.html": [
-   "594be914a131f43b828a88b58f6824a039deb2a6",
+   "8d2bb23f435c5d8f82e92bdfc95a5fcfe991da7e",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/script-tag/same-https.keep-origin.http.html": [
-   "f0acef6c59e420274449f9ce018bab1186c61575",
+   "b6ac13a209828872af809d98b1e001da6722707b",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/script-tag/same-https.no-redirect.http.html": [
-   "569f8c1ded69f5bcd7030c0506db009e80f01c07",
+   "9f2e599719c99e931f2efef7fcbd000a56c1a842",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/script-tag/same-https.swap-origin.http.html": [
-   "c027bcd884daaa9a899cea93af2d9526416d6a3b",
+   "8b940c905e97d4ecff62098c05f0570bbbd8f280",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/sharedworker-classic/same-http.keep-origin.http.html": [
-   "6e6160aa74a81e72b92e65b33a363987882918f3",
+   "1f4d8c219fef6eb9a2c4c738afbb9b0c24c22279",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/sharedworker-classic/same-http.no-redirect.http.html": [
-   "03b0a5ecd0c9cdb87712ddd06c335b17acf47acc",
+   "8cfd6e34217d415ee1ec505bf495866dc1d60123",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/worker-classic/same-http.keep-origin.http.html": [
-   "9c1caa904e3b0f7b47ad7de330309af282316caa",
+   "6fc428e4dd5f2a590ba46a58dd2a767f9fa3bca6",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/worker-classic/same-http.no-redirect.http.html": [
-   "954ed8fa62a7dddc88f227cca83512cf6c2fe8e6",
+   "1609876cd6eff6f3511f5988bd353090a487b475",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/worker-module/same-http.keep-origin.http.html": [
-   "dd8d5e5810468a9853d033dfd481b8527333f89a",
+   "f1e900f684aacdf8c17863dcc1a1797a67b68a21",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/worker-module/same-http.no-redirect.http.html": [
-   "282912b7da492b02c31e60eecb3891756976e555",
+   "ba6fe6d2e21e953eaf455fc4be9291766ea2454e",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/xhr/cross-http.keep-origin.http.html": [
-   "71192894ceabdaa457b92e64bf9e6eb955b4d158",
+   "4b2c48698ac96cefaf563386a7083e286363d82a",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/xhr/cross-http.no-redirect.http.html": [
-   "60033300dd752760cb031a36ffa55fa67c674a16",
+   "9a7052570782c8d15072e53ce091dd2783356e95",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/xhr/cross-http.swap-origin.http.html": [
-   "be62704fe35525072c06941485f54ec4fe40ad2d",
+   "affed7867a0c7d79f0c2320a1d47abad70f7b6dd",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/xhr/cross-https.keep-origin.http.html": [
-   "7d4131664e85e23dd649d58be46b68d6a5eded3e",
+   "70893f732ee70ab5083f956b14796fe8befbe565",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/xhr/cross-https.no-redirect.http.html": [
-   "84e65d398a13ba0ebb94a4c2644c39ab9a38d2a1",
+   "b51c293adfac4d0b9007d913ef290a18a839d83c",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/xhr/cross-https.swap-origin.http.html": [
-   "1b7e54f4ff6066ed54bf63537ff595c601bf9367",
+   "242a50ca8cef872630eb1ca8abdd036ec75e3323",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/xhr/same-http.keep-origin.http.html": [
-   "9f3d16e85d2fafb49f8797b96444ea6fb176b518",
+   "e48d5780d19f20d630aabfa5356ed9d61aab4c98",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/xhr/same-http.no-redirect.http.html": [
-   "40cd238de98beb11dcf933072ae100cf38c8b1a7",
+   "2a116be07770b5247d8bf50531e50f80144721c0",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/xhr/same-http.swap-origin.http.html": [
-   "a912773ca20aa4724148a3f5a7ae1d00eb7ab6b0",
+   "6dbf270a389db0e4a530534388e01da7948135d9",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/xhr/same-https.keep-origin.http.html": [
-   "b0eda9910fd947e6bbf40f3be1bc9c1139e4736a",
+   "840f039a2172835a862e71ab56b81150586069de",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/xhr/same-https.no-redirect.http.html": [
-   "ecfc6a58475f6556cf93eb2b913fd8076fe0f86a",
+   "8a66808cf18b894f58a5b9422c15cc43f170bc82",
    "testharness"
   ],
   "referrer-policy/gen/top.http-rp/unset/xhr/same-https.swap-origin.http.html": [
-   "c166e90808a46ce549c19ec7e918d55d37a1ce7e",
+   "957da8954e71bd5a18b34010e5aedba9dce4ca79",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html": [
-   "825868a0d4af5bcec99f9b311ec93236f477cc23",
+   "d95d029c4d160f2c598070ef8a3e4f450cd9de59",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html": [
-   "9a6f5e974fa9cf4dc06eafc24d0d25ce193302a0",
+   "f62a07ba69b8684acc9c56089f6f9d4fa64d0f2a",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html": [
-   "476831fc95205364711c13ba29ca96e57ce60071",
+   "f0d9894ddb94b3a98dfdfa7a76f2f26e7ba820f9",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html": [
-   "b1a8565526311a5f329fcb8e114c965f9775a065",
+   "883b64530ed7909172f4203efe7f34d600c559cb",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html": [
-   "9cac2ec761e043a531ecedaf18330ad455bfdccd",
+   "8561f5837f619b9909aa39e0cc872345a281604b",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html": [
-   "1ceb25c3f43e70a3e9f10ca1f5d70a1b22f65d10",
+   "fb453f9164a9e76dd1b57839bceeb894c23e3200",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html": [
-   "5865d6b2e85f01c4de09eded2d165b069f351a9b",
+   "850adf2b801f0f2112c8785b13ba3ddb378ddd02",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html": [
-   "9fd2445d62e29b8dd280b542632f8435a3210863",
+   "bc8a5d8cef7807ac611d597044a11b65f9abadfd",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html": [
-   "e88bd9105d1121e6312f3fd6e305e5750918ccaa",
+   "4affb593312273cf0bda854d5d9f524830fc9603",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html": [
-   "209fa3c48b08aef33061834e7c7c980a434ca1f1",
+   "9b61017ed6153326b25d94a50a4f61bd422caca6",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html": [
-   "6672b1eace00a88f73a43a7c1805f1f90ff6f3e6",
+   "733c5a5751213972017480f9e583c00397ab364a",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html": [
-   "ec17b1f121f7d21f96a5833d59fc3b6461a23778",
+   "4e95f1b7317106c4a4fc6f3e1e41a686e9192b1c",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html": [
-   "040a9ecd15a613ce730974aa0aebea4e7e408e50",
+   "c24c8e289cc85cf70c686a5270ad0ccc16829b5e",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html": [
-   "aead299f56e927d61dc66de23c2bbbc961bc4a62",
+   "23c032504ae738121cc18f03d9ccbf24c3603877",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html": [
-   "320ee1d1bb632d98888474585d92636b9e8f29bd",
+   "ced06c88a86e81a572bf75eaf504892ac800141b",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html": [
-   "c3fe91666ac1f7f54e9a9e646c9eedee1cd01c28",
+   "7dfaa1173ffd5fb20ceaf8d971c433936cf42d0b",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html": [
-   "b29d9aa1c1fc40266041960330e4e34d7d1984e7",
+   "c35077e44edbc5eb7c74404b22fd88ca6a6cfeab",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html": [
-   "98f3feeaace03314c94ad69d604886f1c8b88e75",
+   "07d3dd8e8d4c1d175ab200b943530fac9fa82467",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html": [
-   "5bc48e9a9d6274be28dcedf44f1cb11d071d42d9",
+   "60587faa741dfd9278e894c5f4dd478cb28a767e",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html": [
-   "d4ff0dadc7e9ea0ccbc3d0a059d940e0fe761874",
+   "3c1accd872434e32d66e04a0ef6a269495d411f5",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html": [
-   "204e954e9263d9a50d7a0f3a86b519e4b88f2213",
+   "6bcf65289b275d046b7fe93a5c1da3f38888c13c",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html": [
-   "9f7eb31518b1cafba3499defc50c178c26579cb5",
+   "32a8dbdf5a81fea07553143003e1626aa514f467",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html": [
-   "7e9a21aa0a8ed363160f4bc8e7a46ddeb9e75b3e",
+   "4058df83edcffcb78b861c194b67dab7938b312c",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html": [
-   "97e52fb10f8d74ea508603f6327e29316680f170",
+   "71926d873fc18ac1d8a4b2e33ec4ee40ea8abb57",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html": [
-   "af0cc4307ae2a6e93168b5f1930e1af0269dda73",
+   "9da696654eb694c9c4bc77a454bbc7d1d6090013",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html": [
-   "84467bc359512310739a43dad8cc0050370e551a",
+   "db8d0a65138df38488a4794d1925cdbdf638fd1a",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html": [
-   "fe2467f192a812ae7ca23cf115c18ea42d6c2a29",
+   "a2a6024d603c974203fad885d5eda2c8a995e6df",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html": [
-   "0e4114535645bc59c84dd85b6ebe3ebe2421c169",
+   "1c7face5c0edc6c172c9e139fa775c6185916c95",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html": [
-   "1c597c658dc502d833651b6e0e0e77313cc1c48e",
+   "5420401a5147c05c05905400795db30c62eabf07",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html": [
-   "ad9d89802e6a7965d64a8c8924195af45553da65",
+   "0406d3b5274988b2d84a420b82112535153edf5d",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html": [
-   "5309e3f2814163ba1ff75f25c48f2440bd7bd6fb",
+   "8e75b5d505494dbbef667b33630d89d50665f7ab",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html": [
-   "0d049ac6a827d9d649acdb266af83f61270f0974",
+   "3dce0c4ed7ed03d65f65879e792c66089f395e2a",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html": [
-   "1eb934e59c45c979299af1101417cbd7a39aebc3",
+   "36879c3edbae83d8c07bd511e3e1c514503e41e1",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html": [
-   "3e1e5f9a2af7227d5f127426b5ab00fda04b1b8c",
+   "0ace07b1fc07d4b389a16350ff3ac4bfdb51fbe5",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html": [
-   "8ec49cd9c463999abc8282a38a097a9cf096e6b3",
+   "28d2b6dcf70d7b69764e1f3e7274de856f15a7b8",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html": [
-   "85d6718db6240b9355a43119c30ff895f1747800",
+   "00542aaf0a369a2bdd72ed9cfc2234be41e4941f",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html": [
-   "476b90e447370ecb34acd36d9f3858f8f62e77bd",
+   "45696b4f79759ecffd14381f83233e6de9123a11",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html": [
-   "8199f56746621b5b1b5cd52a4447282dea73f20c",
+   "d9e2037110bf1465d6f11c17c29377c095cfaa0f",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html": [
-   "d21736b0595f558a9747caf3fc29c7eb35754499",
+   "00cf01ee39e0defd4f92da15e7d0e649e0b20537",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html": [
-   "7980103efc0a323b3cfd15b3d10dba403b3e4c21",
+   "2ba482a7f5558d804a3633565ff296857de305a3",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html": [
-   "10227a80fd815d8fdebc22c8a42a0d37ab88cce6",
+   "f0d25f6aec9460e71bd97a3e4fe29325aeda50d3",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html": [
-   "eee16a3120b4db36cae55fa00c27c4284c89ad3a",
+   "03b247dd29eaac4054fca7462dc37ec16009766e",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html": [
-   "798b35cb334b3c459be95157f8c706fb708f2077",
+   "730ac91e27ea34b687621ebbff46cf6631937cdb",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html": [
-   "c62baf1036318e6f71aff199c219db63dfac7bfa",
+   "08b59b82833add26f7025ef87f1db636515db288",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html": [
-   "2193ab2d0dad12d78471be1224f518e82aa8d74a",
+   "123968f4f71ab1f1d657cf2b98f244902b3ee2bb",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html": [
-   "cfcfef7529c583ea9576149b4eb6efcc6f94315f",
+   "63a0c36951d5047a3ba6619e84836b1b92a06a45",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html": [
-   "6ff96f572f32533c67dde7e86002b30f0b6f0dac",
+   "c8635e6d00a0af411fb77464458fe1c9dc3630da",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html": [
-   "287c94b48ae47fd1453cc32bc5a1e5afc04f7862",
+   "7f7c1aab9acba9978e049ca32f828fac590b4d7c",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html": [
-   "5eff119a9034d9c66307cc3fd669856c849d9be8",
+   "0a7ef5b0aa649ce48a8d0f409bb82995697f8330",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html": [
-   "0a8d85687cab4f0dc9935a61f82f21a8c8265a33",
+   "7975ebfca606cf82d7ea995c8ec6f069e383e5ab",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html": [
-   "4b310dc6d79329e024927b4d10045e6d9ae7f9b6",
+   "e93bf7e9aab85e44ec022dc9db32476fef21fcdc",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html": [
-   "feb3353ff9fcdcc2db7e7821f6233c00cf6319aa",
+   "486e6c3f2b086737bd97ad9c468b4e1b9b9c5beb",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html": [
-   "a4943affd879ab6d62c277b332f3f5c73e5c1d95",
+   "4b2de7145298d173d5eda8e184fd45ba4238370e",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html": [
-   "8a4f62db32232fdb28133abf58dcaa8d75621c68",
+   "70c909edabc9a0dc90cb601161d420a161bafe42",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html": [
-   "451b518e32e3cce5885f6a76e1042ec2f8e008c4",
+   "491eb5ebe8675213b007c819b8b2c9e622f30007",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html": [
-   "7c9df1c6318b20e22e45cb76c5434b7ed97adcb5",
+   "264c2b2b3286fe08dd6e0ea4bc4b6f9a7dc8c408",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html": [
-   "3cab708f9b3a8525fc8e20dc9cb838ebf500b91e",
+   "a80db6050e6fd42992da03ced44c43e7009d696e",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html": [
-   "93fcde08e5ac3baaeb0e571eb8b795372d1ebcc2",
+   "0a1e56766c77d47ce0931758cd2315e5d272e52d",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html": [
-   "e555bca394eca8166ff13db69808a50e2bed6139",
+   "7d472a2c592255ddeec0e2aefb58be8da325d7f9",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html": [
-   "776a27f16b2a075425e108b472a3f0373ffa4185",
+   "f276f4cfae172118913f82d5f8795f899352f858",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html": [
-   "2a8826b510cc97ef4f0a8206d07f77f3cd8d82c5",
+   "a66e37d0d3c2e961c0015cf1d1eddc1fc94a28f9",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html": [
-   "e530e58910b74fefbab3a7347de3e2a62e7eb050",
+   "485e389d06d19ae805924150d71b84230f5e2a6d",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html": [
-   "347858d4e0961bf560a5a8dddd0038fb875219b5",
+   "e6ce17b533904088efeff75d048d1f6967bb37e4",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html": [
-   "92d6b4e701d1f9411b593aed0ff2d9c9508fbc1a",
+   "170aee6fadc0606e0f3675e12c9dffae87215ec1",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html": [
-   "4a4025c90e74db1514028110a8aefa4f9ac89700",
+   "fd06ec7e3a450b422c5500e74136f512ce67c29c",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html": [
-   "6802c97b51b6a8947c0ab3e4a3af0643efe8e7e5",
+   "f7781f54bccd9e46f4b2135372e963f2c057fec4",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html": [
-   "eee53b0fc2e417d9e8c08cbfaadc892bec838315",
+   "6195157f8aded70fb57d4297768809aa5ba52596",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html": [
-   "a3e3a73a8de7bb8d3fbd43352787d5476ec6009e",
+   "f3c72b0bb22d91b30f52cc2e26c5ec7cc641fe6b",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html": [
-   "5047e9b1911d7f7916567a66b19417e4a7e96f22",
+   "4f7cd44023eda18364e15c49cf93ca562998b3a5",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html": [
-   "a7622186b701dc8f45722eed1a6552dba217b242",
+   "04f96300064e17b12ec9dcc85b213171e2154764",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/a-tag/cross-http.no-redirect.http.html": [
-   "bb08e6adda78f8b9d669d9ad0d4747bf98530fe7",
+   "879a92dc310511003fa69dcb000ee8f25dd61586",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/a-tag/cross-https.no-redirect.http.html": [
-   "e14f676b2781481531584f61772d026b50e6b7a2",
+   "2c9ad195ba2a7c8cc12bf1a30131cf8619e30127",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/a-tag/same-http.no-redirect.http.html": [
-   "1a84ef38e55edd6f3e4fa50a293a4880dccbea50",
+   "ebf1c4f61786fdaeac5654693576c38c2a8ea206",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/a-tag/same-https.no-redirect.http.html": [
-   "8b032e959e1a00a7819fa553da15d942dd8f1113",
+   "59aef9aeefac66ed7b8d8e1ce34a048c6c718269",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.keep-origin.http.html": [
-   "725100262bedecee63e8e907c4e627ca36ca1943",
+   "d8a89812f5704cf3377952c70de00b302037d390",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.no-redirect.http.html": [
-   "db3025ebdae305af930ba76ad2775c29fc767947",
+   "722f18087483457b9e554bdcad626f954413f50e",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.swap-origin.http.html": [
-   "d476f8c1b60c3d3e4c7eb7f4784cb3207cd80d43",
+   "f383b2d53721154c1801ed5a691a535b67326207",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.keep-origin.http.html": [
-   "ead73b6f25f195c39b20f4681ccfed4e4f8fa66f",
+   "155c67135cae4b5d1349484b2f4f3b2fb55bf618",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.no-redirect.http.html": [
-   "fa8ceffe6ff7be68811dea4e1c0a99f42771fae7",
+   "bbc9416ab7533bfec2d96f8790e8a43bd222b9ab",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.swap-origin.http.html": [
-   "25caf44c75ae844682ba731233eb875f57223340",
+   "265c281baa0ac7c54bebca9b9964fbc142b3ebf4",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/fetch/same-http.keep-origin.http.html": [
-   "bc7c35b3f4833ba7668cbe24803876dfed48291a",
+   "4017c03cefafd8216c5fb60f65a7613ea9c9ff16",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/fetch/same-http.no-redirect.http.html": [
-   "d5a56542c5d36cdf00648407a1833059f1f85faa",
+   "dad1873988a32919827f77a315b027952f096fba",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/fetch/same-http.swap-origin.http.html": [
-   "8a96d666699138016683f20c015f77378b07515e",
+   "e74fc6227783928b5393a306f87feeb75bfb7325",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/fetch/same-https.keep-origin.http.html": [
-   "2b0938e2b4205ec6803d80ea0c8e49b9d7d933ad",
+   "ce881eb9fef0dc4890e6a61393f0f62981454ced",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/fetch/same-https.no-redirect.http.html": [
-   "bafbbb5d68139a848bfa0b33d5ae8f3aef991d45",
+   "fabbbd21121b9451d0251c58029fb8c35b7fe890",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/fetch/same-https.swap-origin.http.html": [
-   "4456a15d483842b88256e2bb684f1cfac968a5ba",
+   "bf43d43d5e544dfce445cb7a2792f024fd550ad0",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.keep-origin.http.html": [
-   "55444874b3f5f4661e8f051e0fda2553b325c2d3",
+   "0c7fac4128da31f36c7e4d6ce159cdeacc3c6452",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.no-redirect.http.html": [
-   "98e8ca5d75f85d965dddca6dcbc6c3e6ede45d08",
+   "f8b81d6c5acc51d825f3d2fccd149fb0ff4e3876",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.swap-origin.http.html": [
-   "d9c9bdb7875c93318eab1c43ee92acd2f249da10",
+   "9d74cdb6a36d029ec0310dfb09374e75640fbf1c",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.keep-origin.http.html": [
-   "5cb0c8950122ab4dec9a331c3c36878286f09456",
+   "56ff426017ac9391b8633ff3092c520b2671fdfe",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.no-redirect.http.html": [
-   "0a135da73bfefadabd00b72c0dc0caf6015ad235",
+   "ef8c197637db6c34b07e49e0e2a2cf51b1ee002c",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.swap-origin.http.html": [
-   "c03ea87c786b40166e169a3d45244464ce2e844b",
+   "478408137b72fbb7df663001ea1428571b34fb57",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.keep-origin.http.html": [
-   "de7deba03f428842bf200bdcf8db875d276024c1",
+   "5401aaf7d3b3f43c018cec98e64d6d8d420d23ac",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.no-redirect.http.html": [
-   "a84fdb7e1a07d7eb8a7aa237efb70a97cb1adb4f",
+   "e6f0b5d261e95a67c786a6bc5cc779a73b3906c8",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.swap-origin.http.html": [
-   "3c55c5fc8e0d6d4de90885e4a2c335f123d7122c",
+   "40764e45643c1b4d5696390b1d7fdc15d309f247",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.keep-origin.http.html": [
-   "3d1f9ff960535861524e30ad80a6fd017b37ec6a",
+   "c10031063f9fc82d6c4821b7e4b684fc9edea863",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.no-redirect.http.html": [
-   "aed5c18d25eb3121d620a14f32c716ddf1980d62",
+   "f563a46125d85d37ab90417f9aa240b0f0f63117",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.swap-origin.http.html": [
-   "73ec3c417cb8312ca9a4ef6fd2042957cff905ec",
+   "ae9ca52976c41b7c31ae64278d92ce0fbbbd0a80",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.keep-origin.http.html": [
-   "bb546ba89461757237424792cb807ad9df121b6f",
+   "9d1ea9f839cbd4d89e3486071ffa7ea64a2ecb86",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.no-redirect.http.html": [
-   "3cbfb0bf7e2fd5b82539fe1297d0f5bfd9aa6654",
+   "dbe5de6b53b913ee675e04177c9155a4e0ce872d",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.swap-origin.http.html": [
-   "ce09cb1e14e5def063d3c3346650801aa059e1b2",
+   "cd2e8423c6a93d5682f9372ce4d14418e5138ae4",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.keep-origin.http.html": [
-   "ece42cf99b65a9868f124e2916f44506182dd3cb",
+   "0d514cdc89d268ff77fc5bdc6a104b5daddc80b0",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.no-redirect.http.html": [
-   "5b9cd9fdf5b0fb4b9f7720ae5f8793c838307c4c",
+   "b38c93f408df7a1fbac7c57dc72faa8184bedfc3",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.swap-origin.http.html": [
-   "6bad60e7ec080f4c6ae7f3778475c097c79b2c60",
+   "0e2f607d08d11544107bbceeb0ecbf56a8388d14",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.keep-origin.http.html": [
-   "1d65c6c46b2e432cf629f0172ca13bf063d75e44",
+   "1dca89af901beccada2076e9bf79ca1972217eb5",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.no-redirect.http.html": [
-   "9676d02bf8cc8dedf1b809cfd73afbfe51cb58e8",
+   "0ecfe9ef09917eb88866d8c777e53fe9efc6101f",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.swap-origin.http.html": [
-   "3e1d17b8393a58fb4cb13058c3e1abd789afc610",
+   "333a8993762e74e75da1811db1066a54941c506f",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.keep-origin.http.html": [
-   "e746335e83e714c7f69526658335bb5a84ffc528",
+   "790cd4e41cd1dc8542febd962b36a2b0e26e942a",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.no-redirect.http.html": [
-   "b5355cd168fe1d5c45ead5759851602e72c86656",
+   "9292db100839a7acd8f7c94c2cf4d7193735b4bd",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.swap-origin.http.html": [
-   "54ebd185be9b9e02672a82994e4c3dceb34fc47c",
+   "f5ec18260687fed76e5a7e32613c068b31bed635",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.keep-origin.http.html": [
-   "ebd17499a180ace510c2d06f447d2d91d9ecbf58",
+   "b840e4f2a0aef8fd4120fc343e2275a77d95b8d7",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.no-redirect.http.html": [
-   "2856881dafc6c044dedf960da559001cfdd927aa",
+   "534e529033dede69c9efb20a6c7d6bc75162f754",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.swap-origin.http.html": [
-   "d19393dc7c362d9247df88219b02147e5fa4318d",
+   "b8d2afe7109731ce6c5a1bc1c7d7535dba6af96e",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.keep-origin.http.html": [
-   "c5c5e96891ede998ea6e8532b89997a142b67072",
+   "b64bf9ea708927e02497a9984a0a66b593d31841",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.no-redirect.http.html": [
-   "bfccf50bd9c598241d62087333f5a6e2806d03aa",
+   "365b63113e00239da44c820ecd59bf7d46a568cb",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.swap-origin.http.html": [
-   "c99eb3d0d25821cd5e5c28c4a9ecc007a6613dda",
+   "5b3e1d3b706d5bf9890d10c4c89704fd38f1eaee",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.keep-origin.http.html": [
-   "e5304ba9ef8c1a025228b9c24b590856c505ff9f",
+   "ee4673baba1ae5c67dbde18de6b32cbbb785f0d5",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.no-redirect.http.html": [
-   "bf7791313533da7814e997e422456fd3379501b8",
+   "08b97cdae13a8ad0ac203afea069a7db5d138073",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.swap-origin.http.html": [
-   "32cbdb379568accad4399b84756755b58ef48923",
+   "3cd2ab61106b342400a3a3fe4837c99940467733",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.keep-origin.http.html": [
-   "10fc4f1b857ced2a431539cc95a085c34004a5bf",
+   "1d9955b8c02e80813b46a236e22dc675aeea5165",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.no-redirect.http.html": [
-   "f8c5e8f2f48efdfe8eb40ae8372c7332bf367e89",
+   "bacb5c2d84570523eb32c5cec4da571d3ee1a190",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.swap-origin.http.html": [
-   "dd0115151078d6f91297b857b57b2299a838d7dd",
+   "c8500034e90db2faca0d1d8063b2fd418a1daaee",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/sharedworker-classic/same-http.keep-origin.http.html": [
-   "98e4d99a7971be07e85409dcc2312356ab09023a",
+   "2a75be4f955532b710fe9149b3a908065bf04e08",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/sharedworker-classic/same-http.no-redirect.http.html": [
-   "afb40f0fee930971e16d1d0875664b33d18275af",
+   "55d41d7ab42224670e2f3ee65d801fe9d0852860",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/worker-classic/same-http.keep-origin.http.html": [
-   "a80ea70f6942f0e1096b12379454a853af9d5b70",
+   "0160add32748c5cb183df1fd9b20ae65e249ceee",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/worker-classic/same-http.no-redirect.http.html": [
-   "ab662508f1344ade5c92ea291acbc7056868c97b",
+   "54e517eb2132e287ac77697f77120045b75ff21d",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/worker-module/same-http.keep-origin.http.html": [
-   "771d1d985a06fb4b6fc6bbd9102c17a421e97ea3",
+   "41447ff2ab875f764e3dddd86e39bca3528c3489",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/worker-module/same-http.no-redirect.http.html": [
-   "f0392f3c5ced1d63afe0d0fd8b83bb3bc6d53b3e",
+   "288fdb4f85650d869a456e0e793ca3ced418ce8b",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.keep-origin.http.html": [
-   "e3b3c2a139998174af51b7f61ba254bc514eef7b",
+   "682e787b2a1d5b30360af21803fc8e500f273f5b",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.no-redirect.http.html": [
-   "149baa1e3b657d0d8f0ebdf1e06f461db77ccfae",
+   "cf072fcd674664e461c0a77c1c268821661202f8",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.swap-origin.http.html": [
-   "7944aad538d7d3b37b9813639851413478355b52",
+   "d75278d0a182d38944e345791f91b4aaef2def5a",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.keep-origin.http.html": [
-   "a34ab7cd33c263d315bebedf267eddd1641ac4e3",
+   "616b0f73288fc7c324b54c9737416dbe02c4a530",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.no-redirect.http.html": [
-   "cafd514f70378bc769f5eddae3f4402d852aa2d5",
+   "d710b2e974626e9f46c40f6e37e6e677a954f97d",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.swap-origin.http.html": [
-   "48b1c0ade67579baeeea9207fafdae67d8edbcaf",
+   "8b978844e2516ac0a6f5ea8b04918b79bbdd856d",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/xhr/same-http.keep-origin.http.html": [
-   "dbb9e89d33d9be800fadf4e27751eedb537f4c15",
+   "d8eb56a88aeda05398d5d8afd4098bc99eb98ca9",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/xhr/same-http.no-redirect.http.html": [
-   "d6c4e1ac17cbae7e925d1b7baf881f1c40da64c1",
+   "875ddb2bdfa1c555f770d4d3c57275056da5bb2c",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/xhr/same-http.swap-origin.http.html": [
-   "71d5f84da68c1b8f23f7a80bbceab257dfea4438",
+   "54983bda4146e1a7b3d62f837511c6e15fc315ab",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/xhr/same-https.keep-origin.http.html": [
-   "9142e28d035c4dee551667fff0f02f0a12849113",
+   "9f312f52730d14e916e9da5781a555089ed930ac",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/xhr/same-https.no-redirect.http.html": [
-   "3574fe1d77ac60ad37484a8bc31c454190c60ef2",
+   "62dcd079680bdc6baf2a17917123c222afdb8d48",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/no-referrer/xhr/same-https.swap-origin.http.html": [
-   "b43d26fdf854dac9c56a5e7d30346aa23b0f5dcc",
+   "bda85aa1a5a4b7ae817a4f7627fc11d13ffe5bb8",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html": [
-   "2f9bf4948b7520cf53fc9f7e7caa0da2515adb2a",
+   "cb2416d1ba1811664f16a9f8461c917d2c35122b",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html": [
-   "b4f6755001f2a10d15936d9298e89f12b33e7c4c",
+   "bb2705df82101346c30cdbba08cd56735b781c18",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html": [
-   "91716ed55006e7b81a5c937e5e2cbff1b949b810",
+   "e239f5116b3c65713ebc31b31186f7865fde2e7c",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html": [
-   "13962b2fb932bcbdebe53cdf62830b9da5675094",
+   "66aca52e72f4f71c523eba3b96aa08523ecafab6",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html": [
-   "81fa0738dbfa9bc9782d3e80a0bd25e5d4fe3ee9",
+   "cbc8344fa4e3b940b2eac0536393721e9a67b1bf",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html": [
-   "8a97a1b11e647107307f70ffa1bb757efe8d437e",
+   "70a085dfe9824bafba39dcbbbce0005ce665448b",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html": [
-   "51e3175054f0f8c419e06329efec9cb36a73b031",
+   "a6d82874a153bfee8c0ae5b8386dbfb61c15397c",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html": [
-   "eca42353d95d9913b79f9b3b2df558e498212c29",
+   "c5be9221fbd6f82fe5a611bba977711bd9cb0655",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html": [
-   "15a7becf78a7caee9c8a92ec5519cbe9cf29f7e1",
+   "7f91dcae39705e5352ca9e9bf49c0b542fe24d36",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html": [
-   "4f30a0f57d27aad8ce9a75bec3070da82364e4ac",
+   "0cac5d15b39f0514c66d9f3accd2395d2cf8b792",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.keep-origin.http.html": [
-   "cdfc2f0941d8fdba532ff1c460ea51392c36e6f0",
+   "fb5d40554d0aaac8bec0642c7a9000aa36f9685b",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.no-redirect.http.html": [
-   "265e2b3f670c86812f7af6765c562cb96def772d",
+   "5551a46c19e59c11540001be74a8fd9ca66d08ea",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.swap-origin.http.html": [
-   "71ad1eccab65b2144fb75bdd394266162694e87b",
+   "420cbf2e8058b5cf189e899b7f07ae7647093e9d",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.keep-origin.http.html": [
-   "f3df4bc03bb7c5fdf923527e7f5102a66504d2f2",
+   "1938e64407b94850419108134250792d659a3075",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.no-redirect.http.html": [
-   "f66c9a3a45f0a2b703aec20f57e5a505230f33c4",
+   "959079f10c52308732700cba50a82e7cfe71655e",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.swap-origin.http.html": [
-   "9d713465967a5d80c4a5fb857982e8c843eb1c3a",
+   "b348511386a7c0194c52806260aab8eae3850684",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html": [
-   "1c6da90ba829aaa1befa5599d61fde6667787263",
+   "b8a4557f0e8b7064121c7caaa4bc65a05bff7a9a",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html": [
-   "ddfc94ab0910d1637b298cf1605d6b10220e2ab5",
+   "585a6ad0643163a1b8042b4c3f29eef854bd5c3b",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html": [
-   "2d57b4d67170da04dbd4bf71aa6800e8a576970b",
+   "59b25e53097de14fe0cdd5837b60f5db52e32d91",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html": [
-   "9840fc2729d41348a82e5bf4d91e0803ae492a64",
+   "b11b9b46931741f64597e46585b7246bb408d639",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html": [
-   "bc4520dc8e3cc5cf07cb8854549024112b30b289",
+   "f472621e72d376aa5b70a17b37185c23f4f39fc7",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html": [
-   "7327dde1bcd721cd85ac3304a720a291c88dc943",
+   "1ff5e6faa460d9e94e74932218481f83ed194bb7",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html": [
-   "db006065744eb2def4f961f385b8df938b6cf1f4",
+   "f5e8eafc3d62e3b6f73bbd956e50b9d4c910212e",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html": [
-   "36d1ea734ea380ebad6afce1d6f5d76b50e80ded",
+   "21c4869251da16add104d725bedc552321f0de59",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html": [
-   "adeaf62dfb388167d3de44b102c81869f028a948",
+   "4b84859510895b64bf7d44fa7338ff246dd36f5b",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html": [
-   "4e4272ed6974a0b5d2245635cd93000b2e08432e",
+   "60fab8aed6b9cf5e6d89f26fa0515081ef9700fb",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html": [
-   "7768a9331abceac80ed38052293f533c0624c7ee",
+   "82f251ba2f10863c6dbbba3e2a72edacf0e1bf84",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html": [
-   "ac17b11540c909245947675e1a670cd508680d4f",
+   "bad2a522c5adcc062695b0032688bffb0155744e",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html": [
-   "d3e69dc8e4c7ea74d452f4e376ad95d9cdc46a09",
+   "1f8564092dc84150a0b28bfec4d0580853692507",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html": [
-   "dc4ddf3577e9720d44abecbae3dcd3d81d75d82e",
+   "c019032100e9d76ad2f523d9626faf429845a538",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html": [
-   "e9fa7073b378a70bf521552d41a1a0122a7a49d9",
+   "3bcf5f028ede1bfcfd08230e0bcd5426d8b854c8",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html": [
-   "b8527ec9a73112d2876b5764d2ff47993cb4bbca",
+   "9e9f766bdc4f11a1b5d1801b0b42891d4963d2b1",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html": [
-   "7dd17572c465ca85df60502a968fdabed320829c",
+   "ae795f8e4be3f287047b7e9d91d9ae025e5ee449",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html": [
-   "3ebee1a90d64f3098085ff99ad31ce4b466a7eaa",
+   "d375d1816b05d00e8d5bca1a57471ad78805205e",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html": [
-   "509306d31287d777396040b21cb223093b1a5dfa",
+   "c1d6f1aefc1e21fa19645b28b9d902ba04209f4f",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html": [
-   "73d37a91bdfaec1ab7b309c722b20a2a1ecec934",
+   "57778a2027571c3df36d4c7482193835bae0289b",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html": [
-   "0e283a200c9a9c059084e4e8f32787cc69fe2d66",
+   "0513896dd0340d201ecd5478654ea485fa2b9f23",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html": [
-   "74f45964511c53094772652b8985e606be8f1b11",
+   "a8cd85c76477ab816fb7f4e9770ba2367a382bc9",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html": [
-   "c2bcdb50927d59d623f00401effe65c61c832cfb",
+   "2de77f80ab8db5fc12aff6f7b69b11245be5cd18",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html": [
-   "74b653dadc3a67174cd276e61f2feafb868df0a9",
+   "a2807ff4bbe713e0071fd40613e572ca7112a400",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html": [
-   "8a124ad779605cdc69699dd3528c0a6f2ca9d9ad",
+   "3a31579f8f4fa8c0a43716c3312dcce428a46543",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html": [
-   "d8e48236ef78479612803faca52ef5b3a3698dd2",
+   "d52d043b9c187ec158777ffc4ea602154381fc58",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html": [
-   "3b76a5af2db3d867461859dfafffdc40a6ac056c",
+   "3a59a9ff9fd51fa74a554eddae8ecd3e8b1040fa",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html": [
-   "4a60422d6e7aed900b478ea6ff1512fa8d6ddf22",
+   "804c94b57895cec53cf7a14b0771546fb34f710b",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html": [
-   "902777546da388bf2c6e054d8edb1e91aeede32c",
+   "f4b73bac544dd2c13a1685dc8822c1489b1cd2f0",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html": [
-   "e01f28e6dea4712db8578082b96f31ba288e0c04",
+   "e1603819bfcc83f95b7eb9935407e78890d77ea1",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html": [
-   "58bd36352f8ee3e19eebd2f677f62d0339405e37",
+   "2ff3b7bc7b04645cc0db12acaf026e8b5d4e1fb2",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html": [
-   "a23a7e97434d5061a1d2cd6388d3dd08fc2102de",
+   "dc2e8b645aba9fed6b385448e444ddb87d499a77",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html": [
-   "9fc586f6a439bd6bbe7eeb2522201f585fb656f5",
+   "07f689762037e8a630d9b8400fc7963487904acc",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html": [
-   "6b7c3b0ddff0ae124e3b2af64f0db839bcc351fa",
+   "6e30fb4c157c3a8e0fcb878333848c689add4f77",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html": [
-   "4ff8f587140748bf4dd9bbd75e50b6c5c7163267",
+   "a8e5a94017215976a2118cd3f871b00c466989b7",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html": [
-   "7473fcbea08973e309ee37d41613b1129e797772",
+   "40a8d05146dcf012f09786e83a7716eedf003f89",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html": [
-   "aacb86fc696c1e99d5b64739e1be925683a8dd03",
+   "250b2465c281ecbe99f7a51a9d26f35caa3bf762",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html": [
-   "4db199605a003a60a897e10181049c5fc0575718",
+   "bc4f919b5c56d2612d72c568966ba16703362245",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html": [
-   "2283ad9b3b75d87e0d2296a55d92768eb21aa6b9",
+   "42d190582efc53b570ac44dce8e0f88516338b29",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html": [
-   "c6df272901fbfcf7593e5f6c4910613365cf2d22",
+   "94dfe6cc3e38265834255836a0768b1f8647de19",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html": [
-   "4703eb9ec4a6683225aafb0468dd3e6dcc26b0c6",
+   "96139e7207b244869de74148d0d6395e2edc06bd",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html": [
-   "ebf282323e741c5b5d2f1bc42e09e36d28b78ec4",
+   "565a40ba18035e073ace9f64d3e0f61a20bbd1bf",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html": [
-   "14990ee5259261fc7ce6650474ed465e62351cd1",
+   "6c57ebcaabd26ed76414123edf38fd6115bbd0f9",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html": [
-   "f59130cb183dc3eb2f4a01b81a13873a75defba3",
+   "d59e005046e1d8e7c2f24233eccd80c219b62787",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html": [
-   "65aa00870fa206599b154c848a89063e2fcd2b5b",
+   "0d63e2f1e6cfce44b5b4361b09a3304e38dd83cd",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html": [
-   "ad6fc16271a44e86393a2c78c0268d757cedd900",
+   "e8f19f58366490a0b821af4936e8409dc4797b73",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html": [
-   "152e3ebce6b011de46aed59d8dc8520d6ce6c7aa",
+   "eb6b799f45770535b3bcda3c7098cf5353b2ab80",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html": [
-   "c2976879b82a73a097fb1a6af39a5bed0ca3eaad",
+   "1779d2e094b0be855c886edfc6db80322f079a5d",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.keep-origin.http.html": [
-   "0994e0f587348654db61b378f7b94441001171a2",
+   "aef8bff3f3f9b238c63e1e3933ff424f968af7b6",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.no-redirect.http.html": [
-   "7dc61a84f239b70fe7c393000d511a2de3914eb9",
+   "8ae5d68f77b5a58d3df392c0d73e91161a2249b9",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.swap-origin.http.html": [
-   "4cb23fb9e4db3af35776e240010be073fdf72c19",
+   "970bbaff9b7ba4a844d43f8f78aff4dab2b5edf5",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.keep-origin.http.html": [
-   "6d0b6c5830ea240b7b40473328248844febb8b82",
+   "23be352d56b7897717ece0f4b5429b2cee12991c",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.no-redirect.http.html": [
-   "8ff03c8a5a8954d59f7755e60f76d33bfa77de8c",
+   "eb2d87505a1ad6774b01390f29b9a408bdcd4bd7",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.swap-origin.http.html": [
-   "b790cb1241adb227404b31e6577d660be17841ca",
+   "41739cbf6a3a4a6bb819109f0307ba3b80583641",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/a-tag/cross-http.no-redirect.http.html": [
-   "9277c28947aee6ef7810d64b70b8deaa6f9e073a",
+   "dbbd37f40bff5b1a58dae8e5876165e3c7946fd8",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/a-tag/cross-https.no-redirect.http.html": [
-   "1dbb1fc5ccb8c8c95dff7ad8da5274fb9eda42e5",
+   "7ccc0a08e53a2184ebdb0078d9f57b460a49180a",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/a-tag/same-http.no-redirect.http.html": [
-   "894af1da5df115df81f1b57a0f97d123f8373359",
+   "9adbae32e502e1e4fd5ff10774b213a3e2830556",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/a-tag/same-https.no-redirect.http.html": [
-   "9881bdc4ee7e928fa0b6febcd364ae31cf774ed0",
+   "3bd0461fc3053709bdaf99991748d8bce03f3025",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/fetch/cross-http.keep-origin.http.html": [
-   "63fd2be9f9628adde91526c9204d7a0f2b55d321",
+   "b1b86be1a4bdd2ff5bdc25330263c90e58a1007f",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/fetch/cross-http.no-redirect.http.html": [
-   "f564fbebc5733f460e96751d75a627556ffbdff7",
+   "5b18c7be6e92716252c22d7789fbb9fd3b4086f3",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/fetch/cross-http.swap-origin.http.html": [
-   "446f7076ee7d8766ff30f59634ccc23438aaa8df",
+   "242346a39977be60a0639f40205866d44f6c9883",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/fetch/cross-https.keep-origin.http.html": [
-   "a6a9a8a1b220dbb4fc6b00fc511beef9f899a795",
+   "28153a8b4be24f004cf5ea7e4e9b6bf97af0f993",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/fetch/cross-https.no-redirect.http.html": [
-   "f0f6bb6135e4ab2470d9f4e602131b906147f113",
+   "8d35aee072cddbc90d704604a1c50c2afc617e0d",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/fetch/cross-https.swap-origin.http.html": [
-   "9408a75c5b5520379ff69932ca7a4dd1d155986d",
+   "8a6e9ef07c7399a1701a0389c0597969057c5c67",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/fetch/same-http.keep-origin.http.html": [
-   "c53527a5f406c267ac9f7e47a2085bebecea8322",
+   "caf83ba5dd491c4995fd1e1a7ead981b2de10b1a",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/fetch/same-http.no-redirect.http.html": [
-   "2e69c9b6719dfd47bfb7d83afc8b726c29692f55",
+   "d8b4861670f6a0ddc36f8a57c02982a7a90728e8",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/fetch/same-http.swap-origin.http.html": [
-   "4ccb297816c93e6043da4dda463cda9d0432e653",
+   "f09e377c66cd5c4bf1d452e304833b11323e1795",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/fetch/same-https.keep-origin.http.html": [
-   "72a2bbb19b18daeb5c35c607374a754a5177de50",
+   "ce38cffef99ba280fd2e2edcb154263247f65e96",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/fetch/same-https.no-redirect.http.html": [
-   "c1a1d90beee50caaea313ad70576ad1983a7bca1",
+   "b4f3cdd8982a5171b0a46392c03867e8ff3ea568",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/fetch/same-https.swap-origin.http.html": [
-   "4202ef50a8091968e2a5c927e0015515525ee22f",
+   "cb4af3e45863041c33cc2211efaa2f62ba059861",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.keep-origin.http.html": [
-   "ac008da94a1763f5c8f9773026a4ec91aa5b8db1",
+   "791330003b90dbc34c4a71c3c65f91f30e652cf3",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.no-redirect.http.html": [
-   "449d06a8424b136178fd21717424951a0e67f2b4",
+   "f7de0c55e24f665b99832513f36403a21a8893d1",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.swap-origin.http.html": [
-   "64e76c518bca1cdfd70ef0c116232f66c277d308",
+   "dc417fc3c6c3f7b06281caa4c0efe71bd2eec992",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.keep-origin.http.html": [
-   "c6c981ceb44550a1c3e74379ce21a7412bd525a2",
+   "9a1c6a3a891a828c702c792976bb74999e2818d0",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.no-redirect.http.html": [
-   "2405cdbd0dce442a767d2f3d0066c759433a313f",
+   "64606fd08afbd19579b737c05c79ac6ba53e629f",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.swap-origin.http.html": [
-   "40bc9a0e6481f185bf3a5c624685c2687bbba9e1",
+   "d00db3d73c811b90fc73e502fc03f688ae4a0f9f",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/iframe-tag/same-http.keep-origin.http.html": [
-   "1caa40ed81ebfc87d17d9faa5842166ad7a9792a",
+   "3cb422b083441302f38fc475e99c89c5d96a7fb9",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/iframe-tag/same-http.no-redirect.http.html": [
-   "232dd065279425b0208881ab8f9f669ea77cf869",
+   "ca4746f5a4e45268b2621180404f5ec11ee56078",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/iframe-tag/same-http.swap-origin.http.html": [
-   "ef73d2a759e685358d43047ddfcd3335cc42965a",
+   "262bdc5b01d8cf5d18848ae274ab1b691bd09851",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/iframe-tag/same-https.keep-origin.http.html": [
-   "ca2ea3a1241488637cf38a6557ca11d7a4331b4a",
+   "c92b24921030a86033f005e6942b524e9e0e9fdc",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/iframe-tag/same-https.no-redirect.http.html": [
-   "b72264e1ff208bde3a7cd1395e3b3ffb19fcfa85",
+   "0817c6947380f5e74c3682f507cb91774c02709b",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/iframe-tag/same-https.swap-origin.http.html": [
-   "aff2a9d66782d34dd05fab5cae4702ad72c492b3",
+   "999f3ff1655e055e0d86d9e7ab2edb76264d80db",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/img-tag/cross-http.keep-origin.http.html": [
-   "5f355e5562a3e3a3c895f21ee92e35999552e357",
+   "4c3c1620ea657043c880985988df0d12bf61c44d",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/img-tag/cross-http.no-redirect.http.html": [
-   "cc5e5ad7815bf3ea23530b763269d5e25c73ba48",
+   "4eb51ac12fe42c3dc2f66cf556794828dff49c7b",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/img-tag/cross-http.swap-origin.http.html": [
-   "26cb56fd806b9ac483d6845fd8e32e8b9f07746c",
+   "c3561800fdb77423f682a35b80bd3f905da47cc9",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/img-tag/cross-https.keep-origin.http.html": [
-   "b56de8a740fd407db1731b160dacf5df7195bc10",
+   "e9edcb8e0e8cf94cc046859b4ad2c61a3b04a38d",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/img-tag/cross-https.no-redirect.http.html": [
-   "1ac715a376c680a957558448f2d367716043b798",
+   "69f3bbe7c94356dbc085b55e60d96ddaa515d0a3",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/img-tag/cross-https.swap-origin.http.html": [
-   "80cc9e4d1b8d344712baa2fb2371ad88d39845fc",
+   "7dd8e299d49891283b29f533888df9c8379f267a",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/img-tag/same-http.keep-origin.http.html": [
-   "6f33c342c8f2979999c93cdaddf9697860773003",
+   "51d092f64f2f7aa5a41332812750157efe71e837",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/img-tag/same-http.no-redirect.http.html": [
-   "6b9d3f058e49e16cf3233d5a9d08552a77817823",
+   "92fef43c906ca784bc277e82187740a2640caa2a",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/img-tag/same-http.swap-origin.http.html": [
-   "270738fa85a36467e00a2f01047bb8bd9e00d838",
+   "dee8ee1e5d1f5a3893b24b9789949f846373ab01",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/img-tag/same-https.keep-origin.http.html": [
-   "a76c575c1facd01c717076f9ef1db0085a0b6532",
+   "0067b947d162bb3fe60bc5e3d820dd5ec0d3ee90",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/img-tag/same-https.no-redirect.http.html": [
-   "ddb84cb3b67f440b23a38f5d1e4d12a4bf54b5dc",
+   "f2cea06102c230e490cd61cb46844c5099a87555",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/img-tag/same-https.swap-origin.http.html": [
-   "48d5905e5741931994374c7e70b39a34e1c8f0b5",
+   "bd774c1b77db204fead62c971a2daae7f8eee5a8",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/script-tag/cross-http.keep-origin.http.html": [
-   "5968953f459e3184818077233fff9d654cc11645",
+   "68f18780625194964c2881e1ff055c7f7b417edc",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/script-tag/cross-http.no-redirect.http.html": [
-   "f766b2c82a6156464e76be6bc9cdabfb4c7384d5",
+   "c11ef15b3254f71d87ad22c08fe9f213f87d5bb1",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/script-tag/cross-http.swap-origin.http.html": [
-   "1165a2e082ebc09fc9f7f2ba02f6488e8b1bcc01",
+   "48e1f0e20f3397671efa5d4052cd54a35af18c18",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/script-tag/cross-https.keep-origin.http.html": [
-   "02bbaa369d7f6e71425081f427d723648c738338",
+   "19051b43f3ae5ab7f0d3af00d66cadb417223510",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/script-tag/cross-https.no-redirect.http.html": [
-   "955e322ee93afed1bc92d8cda9826003a29059a4",
+   "e144b2cf9d427392510ddc55316a810b01b493a3",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/script-tag/cross-https.swap-origin.http.html": [
-   "6c099d3232523d02521947927fa88158d6ce2991",
+   "2065843890b300697e6b0c1af6b6f221680772b5",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/script-tag/same-http.keep-origin.http.html": [
-   "4a136fec3c6fbbcc0684941bee3f7a227cb5e99c",
+   "239199198ddf23e7981191686aa5f23f307123f3",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/script-tag/same-http.no-redirect.http.html": [
-   "8465a79e0796d26d4d6c5893154aab9c8a3e57cb",
+   "00e78e9f0b97fa8ba40b174488cc5a9cbe322581",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/script-tag/same-http.swap-origin.http.html": [
-   "80babb63389f213de4849c71dd8534944a525c9e",
+   "417e470c033582f71d94828439de6229ea53e856",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/script-tag/same-https.keep-origin.http.html": [
-   "9e05dfbbe0701027b59e4c493a82eb89d09ecd5b",
+   "9ca3846934a66c3f3f9fedb2d49c93688a2adf72",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/script-tag/same-https.no-redirect.http.html": [
-   "c95c268b242d2b4f5e517829b3b40cb4776213f2",
+   "a3415b9cf9b2ec7c560d1130c944d387ebe62cbb",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/script-tag/same-https.swap-origin.http.html": [
-   "9a225bb307b360a1c12c797570c1ff4fed996a98",
+   "b6f1e5ccdf7da912a1b7201d065ff782bc37016f",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/sharedworker-classic/same-http.keep-origin.http.html": [
-   "84fcecc5988bbf8e66cf905d6359c7d2da7cd115",
+   "e7a037d065d33e97fc0c73b4476728778b64f9e4",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/sharedworker-classic/same-http.no-redirect.http.html": [
-   "140c27b5bb573d925aee7e5af7b88862c9d93736",
+   "480fc6cc63f982e335a2e2b60d12ff834c1f4492",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/worker-classic/same-http.keep-origin.http.html": [
-   "b10fe3c0007d3d1bab79d8431402f1740d9f87a1",
+   "3053f3001e707dadd32b769c0ce214dec6a7afc7",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/worker-classic/same-http.no-redirect.http.html": [
-   "4d67e3b9791613d25cb0b3e27465416005599820",
+   "2054f171bd193dd85dbc336d3c31c0293ab9ff3a",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/worker-module/same-http.keep-origin.http.html": [
-   "5c502e16a142b02f37e3275d006363feae00c969",
+   "3286e930b9af69e6b205da94e1bf8f93679afdc8",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/worker-module/same-http.no-redirect.http.html": [
-   "98c6d31750d09c6ba32b5338e3b3797919074f63",
+   "a491039ccddadc4721bcabb47c730957bcb23143",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/xhr/cross-http.keep-origin.http.html": [
-   "4bbdc3c48e7623ca44f8cbadd2bf1937b55868fb",
+   "c25b2d231162280cc55b262ef86b513d5bf3cf3f",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/xhr/cross-http.no-redirect.http.html": [
-   "68f03afdc7012a279ce3e06c946de7c24761d8f5",
+   "0d4b092ce935f1789291865030e9645bd47b364c",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/xhr/cross-http.swap-origin.http.html": [
-   "7b3473d8c9df6dd5cc82ff24e8c96430cc8df1d7",
+   "06d3afbe4515b16a2745dcba9a129c510894681e",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/xhr/cross-https.keep-origin.http.html": [
-   "47c53c2ddd079e05494a80e157cb71c7d43f9959",
+   "ed1794be12860a73a9830004e80fa824f9c0a4e1",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/xhr/cross-https.no-redirect.http.html": [
-   "7fa4360968a5ef79359571bc6e01ad08cf1a3474",
+   "d448e32df0d30cf05bcff83c58aa170f9bd80445",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/xhr/cross-https.swap-origin.http.html": [
-   "9b08cf1b89c467b09a243675da295adab68ab3ec",
+   "a1400f7abb3fb440a13dc1abd7b508ecf2b835cc",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/xhr/same-http.keep-origin.http.html": [
-   "314830775af9b0c1c50e3f04cb1ba749c9436567",
+   "b47d899fdf72f36bc52b9800fd2b781355ae676f",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/xhr/same-http.no-redirect.http.html": [
-   "abbeb0eac41bcfedd463cc629ab3b3be660d6f6c",
+   "3735a14edbf02b8dc821747bbce87822528e9ef9",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/xhr/same-http.swap-origin.http.html": [
-   "f190467331d5c1b48462180e6cf278627bce44a1",
+   "8a9aa1ce2674740c16c15cdb494045fdd5c26499",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/xhr/same-https.keep-origin.http.html": [
-   "0461c4c2586d062b34ac7be80fdf08a2f3b7a3dd",
+   "b336cb1dce5cccf13a359e5e7d8529e00691f9f1",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/xhr/same-https.no-redirect.http.html": [
-   "ec81dadafb97f925500f89d4c132036ffbb27551",
+   "22f8cf7fb4b4da6b3fdf4280614d75bd2eca04fa",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/origin/xhr/same-https.swap-origin.http.html": [
-   "154335e620e142d45a99ff05e346a787bd4e70c3",
+   "5feba3f0d69baa10a3054589223ebcc805baa004",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/a-tag/cross-http.no-redirect.http.html": [
-   "c9e0a25db457f1e455a011401e653ca0593e9b84",
+   "cf9f09f4aaeaca103f3f6a6798b4f0289c263c57",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/a-tag/cross-https.no-redirect.http.html": [
-   "9a18f4f77ed8e6e999906192b3ed37c65473e75c",
+   "3a7d1707a178d1b2d02dafe46c87111384107564",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/a-tag/same-http.no-redirect.http.html": [
-   "4a6d64d1169637c62c7aac5a31f0f496b9b8aabd",
+   "c47c7aea18d96e301a5aebeaa147d64e3325ec6c",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/fetch/cross-http.keep-origin.http.html": [
-   "f4c9d47e8a0fdcc0cb13d8d382444bd75e217073",
+   "4a7a1cda72271bd9fffaba84b5f46bd04df7e131",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/fetch/cross-http.no-redirect.http.html": [
-   "922aee1bfaf339936c1adcea68a68a980ee42da8",
+   "75c47f4e9ba545a0d1df95d62285ea0c51f7505a",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/fetch/cross-http.swap-origin.http.html": [
-   "497aed51839ba43c82ebfe5cc001086011afc2b3",
+   "29c901d7d148497589cfda0def0f1fde25567435",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/fetch/cross-https.keep-origin.http.html": [
-   "9874739ecd5536d1e05fbecea3f75ff1d1ae4971",
+   "aef239c7af2acc9f48d2cd7e62603c046622be6a",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/fetch/cross-https.no-redirect.http.html": [
-   "f444865432b8ff6370eabefe0da6cb993a693ad4",
+   "69ff999ba1ce556b52a26ca5d4d9c92cbd96db5a",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/fetch/cross-https.swap-origin.http.html": [
-   "6875451d9efa4358f43ceeccff31071f8945f477",
+   "ad689e6c84d8773a9d0249dda8049f20bbec93cd",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/fetch/same-http.keep-origin.http.html": [
-   "47ac06ab7e34f31c75841dca038e9606110da94f",
+   "b5e05b616eeaf476d2d0dedc372750ec5e8e7a46",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/fetch/same-http.no-redirect.http.html": [
-   "c8561b9acc697f0889c28568c6fe138150bb20a2",
+   "f7edc26eb0b9a2d8cfb594bc4328601aae384b7c",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/fetch/same-http.swap-origin.http.html": [
-   "6d53197196cdd1b80a3b42380b8d12a772456468",
+   "857d4bd8f4bbeac434b6514558a53edb7c2209cf",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/fetch/same-https.swap-origin.http.html": [
-   "960445ed130027d88052194ef276dfce9f094352",
+   "e2da502c82114ac30def8dc8bfa53d958e18b53c",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.keep-origin.http.html": [
-   "96d8ca4adda6774d2beb1adb223a834bfe63baae",
+   "05955e9f83093978fde495c54623390d82022035",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.no-redirect.http.html": [
-   "a75887a397a7b05e258b664dc49d56ded0cdf764",
+   "ed741ffc83550bcf4ef85d0a93e14c2ad404b6b4",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.swap-origin.http.html": [
-   "2e4a7cf989ce9a413c6e2d5e520adcd186e0d6f6",
+   "1748043b115dc9398e3bd40e28079581dc347599",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.keep-origin.http.html": [
-   "1ae45f67922e3c04c038424c1669372dd212a4ea",
+   "8d8541939c01b32856ce4c2f1e2dc40516a8e018",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.no-redirect.http.html": [
-   "29f9ef180700056d2933c6e7198f79f7e69fdc02",
+   "f7b99eae78314171f318310f6cb99cab0ae4745a",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.swap-origin.http.html": [
-   "f06f7ea504ef4b841efe6df5ce460d2fbd1bfa0a",
+   "45617b38dfcbefb10484fa7b9f03aa3cd53002ab",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.keep-origin.http.html": [
-   "8f022223fb6a19f1403b3bbb600d09c1a324dbe3",
+   "ac88db60a1ede36dd8db92c4a07c36f38af39ec5",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.no-redirect.http.html": [
-   "e48f91806f5ecff20801aee62155b9293de9198a",
+   "cb38caa9eee11f4308cbdc031ce8b734a666a9e5",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.swap-origin.http.html": [
-   "64fe1b9c5994779c17ed9b9c56e765302cb62e70",
+   "284b3d3cb7df46e2dd71b6458748c19f8a892b43",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/iframe-tag/same-https.swap-origin.http.html": [
-   "6d947108e8c77ffb6537d5032f559aad634a6a28",
+   "b0d1cc6b995ca575d310b452898dd2ee772837fc",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.keep-origin.http.html": [
-   "66186545f7acdc8322fe3dbd5cd63dd274bccf0c",
+   "6c0ac8cdb445ced0eb856ee8993229663d9039e1",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.no-redirect.http.html": [
-   "98733bc2d50db69cce68a9e09a49916160278fc8",
+   "ac6428b3601f22d3211cc5d004fa05205e411419",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.swap-origin.http.html": [
-   "6f964dc0f215449b949aa3f9e1750e2bfc8b2da7",
+   "bdfdbb422e85476a47e7e429124780a3024c9e09",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.keep-origin.http.html": [
-   "be896539f79d73f952be8b56a2dc114effb2b318",
+   "250ea86ec8c9114dcdd9accf4d12d6ec4be79f58",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.no-redirect.http.html": [
-   "3019d368b20c94450c08cd9a835b2dcca34fe371",
+   "95b99976e55f8e3f0bba087fcb3541b813511596",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.swap-origin.http.html": [
-   "51dada9e83616358bbe81f145a2d0809f03de5fa",
+   "42d4a46fd2f937d3a04c479c45323649570190ec",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/img-tag/same-http.keep-origin.http.html": [
-   "bcff54cde99c4f1bfcc872ca826c3a7e9c9cf683",
+   "517651319bf89c84842c32bc846c91613b0fc57a",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/img-tag/same-http.no-redirect.http.html": [
-   "9c8629cb572874bcd8032c724f36b21460976d77",
+   "380692581116852620f956298866a4254822783b",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/img-tag/same-http.swap-origin.http.html": [
-   "588baf9c2705115848ea08be76cd992b0960d6c0",
+   "432be2d5d6f424b7b188128c1bf610940a9ba73c",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/img-tag/same-https.swap-origin.http.html": [
-   "b41a6ff4d6f4d1ae6e35663a4444f92e3b46227d",
+   "0fd23f84c4867ad943cc12cc1e0d352e6f79fca1",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.keep-origin.http.html": [
-   "f3830952f48b534e82bc3cf1668ea8bb6f64a912",
+   "548f0bb2052695790c85ca45cd5b2bc44c87a590",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.no-redirect.http.html": [
-   "1a744125943b2966043366a12eb9109adaa4c820",
+   "bb7263fc365e118b4942a8bb3f9f0d2ac566c5fb",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.swap-origin.http.html": [
-   "25c7a782fea78fe809a38d2a9de514e2d497f8fb",
+   "2ec0e5787cec00840a25fdf9178b8cdb21d5f917",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.keep-origin.http.html": [
-   "ca940ab9a01323d0760c28b96924871b016ffae3",
+   "30100195f12cee41badf521f59e2c54d440f582e",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.no-redirect.http.html": [
-   "14affb7ffd256d80599f8c75c7fb45561732717d",
+   "f760e8440705c604236353e00f40f59a76019b6c",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.swap-origin.http.html": [
-   "545ccb26157a9d226c28fbdeffe6450b3768cc94",
+   "d3b06c12972941758d3f5f32d0b29bea37e9b51c",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/script-tag/same-http.keep-origin.http.html": [
-   "1f3ce019c192f809fab19be5e5bfd5a0c9f04caa",
+   "67efd10c46829df171446ef8b14fa6da2d3c290c",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/script-tag/same-http.no-redirect.http.html": [
-   "8eb22efd17a794252baaa4c8c7cff2e4050d27eb",
+   "63170ba82466ed3abfb63d9759418b34a1b60686",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/script-tag/same-http.swap-origin.http.html": [
-   "5ca347a091cec79613a86099814e8db12f7995b4",
+   "e9820afa49030ca1e2c6faf21811e01e75ac06ff",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/script-tag/same-https.swap-origin.http.html": [
-   "f5a5c14ff79412414a32b928d5ffd0b50e2c94e8",
+   "7be69367303a557453da0b35e0d46236e22ca2f4",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/sharedworker-classic/same-http.keep-origin.http.html": [
-   "3195a862c5ba5f695a2146fe64f3988a1a00251e",
+   "76a444d3bb9530257972fb6b2004c995ddf4e7c4",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/sharedworker-classic/same-http.no-redirect.http.html": [
-   "e171e121b4bfb3e53e5351cd39508df0e6a5dd44",
+   "f734c5274300a73737fd8ec4a692be5f24430648",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/worker-classic/same-http.keep-origin.http.html": [
-   "23395eff6871bcd627fa77113e2e2094f6c44a14",
+   "410e398776a09e750544de1caa5efdae35840229",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/worker-classic/same-http.no-redirect.http.html": [
-   "fd86e10340f72a1a316204a8381151303d28d9ff",
+   "ce29f720852600519c42ee55bfd3149acc2508ce",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/worker-module/same-http.keep-origin.http.html": [
-   "4f1ef7c8382cbed9d26769ee10f0016f4a70934c",
+   "573908ca89d2491e588caa562a56e4bef8eaa882",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/worker-module/same-http.no-redirect.http.html": [
-   "4814b06446e612733b8fa2138619d40b234fead0",
+   "5d1795d03b46ca512a9873d50b8e13a06cde379a",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/xhr/cross-http.keep-origin.http.html": [
-   "ab12f602fe934720f1d8b361cac9784bae758766",
+   "6551a65f0d9dd7e9e98e0fb94c6efad1364cf094",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/xhr/cross-http.no-redirect.http.html": [
-   "e0ef9be74343385e863dbda53c74c065e00facdb",
+   "aa6a9afad076d57465d4de363a79492bb4b880a9",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/xhr/cross-http.swap-origin.http.html": [
-   "3607fac2a4408cf9a023e3205aa768795c9e108b",
+   "d2127b5dee630215e7149f2ca971cbae519f3a75",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/xhr/cross-https.keep-origin.http.html": [
-   "95410ec6f75d0dbdeeb8db14b8e80f8f835ddac3",
+   "33930eb401edfdac949f4747b07e6a66bfb3ad90",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/xhr/cross-https.no-redirect.http.html": [
-   "56ac1a8b29c54067f06f8277ca1bf674b52fdfc9",
+   "9a255c548d997810fc5d4fe8188db37e3a24615b",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/xhr/cross-https.swap-origin.http.html": [
-   "4745c3b2342064217eefdb8b4acb02d8b0f05cb2",
+   "1aeca79c82cb04ebe384639330642c71b1768725",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/xhr/same-http.keep-origin.http.html": [
-   "12b6d3a690dffdbf3ac4422e20e84172166c7f8f",
+   "5aa24a263813cd736176d7ef5aaebca401849f08",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/xhr/same-http.no-redirect.http.html": [
-   "08aae0baa545c806cb56e8700cbc556b5abbb70a",
+   "491fd0994101ddaba54aac4fa856c326751c8422",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/xhr/same-http.swap-origin.http.html": [
-   "a6fef380f2bf0ec4dd28435d12f36c2287936106",
+   "1ef1bbffd1f80bb8f3f3483d5c7036319427e610",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/same-origin/xhr/same-https.swap-origin.http.html": [
-   "1c7329fc12806ddc700f461b4abb3c5f4f0fc8da",
+   "7fb51684dccf6bed190ff3a8d073d688dce8bb77",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html": [
-   "55982aff7ecd2b711a74c9a5c23d96c031de1ad2",
+   "cc6bcdf625f96de789123718308517bc8446adf4",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html": [
-   "07ca09b806e1f77c31ecf92c79a8ed02850a18cf",
+   "5a6b4a5630949664c3d83b8844c5699bdc3a7f09",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html": [
-   "4ae845cb8b6cdc18d19ded84580b4ef9bfbb6573",
+   "a1075a9575d144b8db4c6d33143ab8c54ce7d828",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html": [
-   "bddfeb1fbb6d4c6cd8bf433df21496a57ce190d4",
+   "5ad2d96ce41f8e15eb712fd4cd4f5f3380d77b7c",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html": [
-   "50cedb64ba746da632f253ee82713a9ce3bb7e1d",
+   "988502d5c1463ef63cf1f4dcffdab54c08b8dc0a",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html": [
-   "58a5f0b118fd8e9b7862740a5a43c8f2e866746a",
+   "02f77c18b912f8b3a44aa4c074b71a0e7f05ad9e",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html": [
-   "43142b08d390958dd028b205d64aad630f57b8ce",
+   "fbf506d06299e84b3bc0afdda1752268f3b6530e",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html": [
-   "7ed35744ce65574cd263cf3fef0e2e280629c60c",
+   "7d6907b9c1f2fa2e247597314d6a71c871b138fe",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html": [
-   "27b58b9c2375271e98459ae20c2b2737d39cab86",
+   "7f19373a1ba6052292699580c83db61e5104ad47",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html": [
-   "da53bcee3342563d33e85b8e64451a1193739d84",
+   "4fbc60d3db2380eaad9b2109bc42eca149263e78",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html": [
-   "cd3a9574fce31e76d89f4b5e9c05417c58cc7e9e",
+   "9952f1de9727ae9c1f91f0226c169da692ac2f93",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html": [
-   "fbadd42b519f2dea8a3a3d47966147ddc33af004",
+   "af220298327adee86a10ac5f3da76da477fb801e",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html": [
-   "994e27ddc04e9b32a3127afadaed6c0628d48b1e",
+   "e0ce6dd98a536217ef66fe9edfda3e3ddacb9535",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html": [
-   "c08c6406d5df99cbec1b7bfe560efe8803f26a33",
+   "edd55f4b4f38c99e5da845e7031148f17b7ad17b",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html": [
-   "8dcd58f6fb4430e7e54f86816c7f1108c3a8e8fc",
+   "2c22f125f95786c4dc1862c75a60f5fa20cc963e",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html": [
-   "816b3e8b2946c3f0cf2f009114845c2eeddc526f",
+   "c6dd6fdd727e58d77ac8c29f9927eeae51d4b9c5",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html": [
-   "960b86cee452e37d59a2111b8f52e6268311df62",
+   "cdf60a63e44d396b1d80b0ce0a2c10163a92ba05",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html": [
-   "4c76f6f5af3e38450bbe80c2051ac6e96cef9d57",
+   "13f2be668c22c63109d1d6c915cffa164034a681",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html": [
-   "42ebcdaae2489916783e84452561b00f09699501",
+   "51177141400c31e9e4a6ee519ea0933d282a0e8d",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html": [
-   "8614e3800ad812ed97ec1ed0794e51a0f08dec17",
+   "9f0e08f64c4b6fdb2aff731ee9e7d481d061a758",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html": [
-   "7d6c26e270b2d4baa2b4ddd53a3792452d08f117",
+   "0c03e1dfbea3cfa7d2508f830c56c3fbf56001e7",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html": [
-   "4c220052c962a11f06527395cc82f3ed24f26f83",
+   "09f87f74c92b8ebc842f46bbeb47f5a50e7db98b",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html": [
-   "60691c89d307074f40c42915dd3973db5533d8e1",
+   "812ce4e688ab17acf936ba30d83567d335090555",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html": [
-   "3624ecbf962f3ec986be647d15df1850ae2e72ac",
+   "54a39ceae1d04fbd11701acafa722e4f1751b165",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html": [
-   "0f8e9cfcda63609d780db3a3fb56ee92f86527d4",
+   "62dc439028425c518522eb714e78c13b08297118",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html": [
-   "7de74e127a6648aeb873484d5fc4decfa500b5a4",
+   "8d2889e767c26b02a0d9b2babba126529a4cf09b",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html": [
-   "a4879636d557c32ed84451dc87e339a4e89c2e20",
+   "4f50b75d43e6e903b80c6274c3816acc0e9dcd83",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html": [
-   "db2da5c92cbd71bcb2a211171fdc3e1625388708",
+   "8c5189c49537cbdf0616018da499a68c6489d9c6",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html": [
-   "50a4b747ae387b6f910a6e457d75f1c2fe63a5fe",
+   "b0dd98545c8e13af2cb56ac4081f53166d95adda",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html": [
-   "9bc48713fe4222621ab335ed8a9aba7fe79c6f3d",
+   "d09adb8dedc57579fa2dec713edb78f66d72b869",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html": [
-   "2560bacb16cf15e7fffeee273d48cfa864151ee5",
+   "378ce57c0e8abdd22b9ba127f4d91a55897aafee",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html": [
-   "85acfd7154e4c33155f2dee8f3cdd726f22224ed",
+   "b55b0041ecd0726b1331968fc256cd1c4a303435",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html": [
-   "fe8d90e1424c911a73cd0f263ec2242bc8e05e0b",
+   "d2b6def5405cdfd8c5ae0f1b54a5fa78c7d1efc7",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html": [
-   "5e3abd1dd6d6b4d7d17f167668df4084d5f4979e",
+   "9b5bd51183b5ec51e52cf36b19ca151aaa57496a",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html": [
-   "bb64a89fe71f18f611217e73efb55122f5d75f9c",
+   "019b5d931455a337b192611a85ff8aa97a5903c1",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html": [
-   "d5892747dbd59b643ed1fee7b4b3510d0b54e19e",
+   "4d9e585c5f5f6a445e5e1b94d3c72c152a482a35",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html": [
-   "b7c335e507944602aa1f93be653c007ff2c1ebe8",
+   "c85b06b49952fc264ca59d04633ce44b0bad4533",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html": [
-   "1fca3f13a4dd5686bd47f424b61faf08a08f6286",
+   "09d2ca1682a1fb8a87aa0aad029c2683b4b99199",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html": [
-   "a840109490f9ebca4c40d85615e48bf9dd7c9357",
+   "69b57be84e38d9befc585e063efe542437a2bce0",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html": [
-   "cc7d597905605534d6284e093d9313f9f5629cce",
+   "2353fc1a85f2b4f8b1e25675e7039ccd6ed11ba8",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html": [
-   "1fb432779f2040daff12234cf80c23495b8166c0",
+   "39f774e9b3eb2d68cf92eebbe5f6c7eda045e26d",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html": [
-   "680589586933f6c7effa34c7a00c346e0beab8df",
+   "9a5c3d7ff3d3c81c6d2b93ed3b651eb119dbbaf6",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html": [
-   "fbe0e2913a17e09f30028d0a56bb12d338d6e486",
+   "9e5f5a5b2482d498beb59be3e8d5cfe763cc9924",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html": [
-   "d65ee887e34486c8199306bec83cb258fbf5744b",
+   "16c81efe7554cdfc63d8f635220ff5f99464c377",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html": [
-   "0c9209428f7084dfb4f4a371d0708622cd43b568",
+   "5dd4c12ce9a5a074b5bc25971fa8eac342a01440",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html": [
-   "8febd856f138d21e9439a380b1e0f392c94dd61e",
+   "3586e60a9a226f054fe372a92efae264006b0082",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html": [
-   "c4da26788d4109d6a754657337cac75548a0a9d2",
+   "f53bbfaa7bda0881c8430a293837dfa6c4fcf190",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html": [
-   "5d7684c5df9783aa0546522e8a6e63d51bcaac42",
+   "9b52526335f8742aada05ae472185a2064ebe307",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html": [
-   "2c28e914f2f64559fa1f7402bbdde897954737a9",
+   "85914f54ada0753e5f6876ebca44b0bb7d596a60",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html": [
-   "c066c5803808d4fa1811ec02c7a517d7f9470cd9",
+   "f6b0d4f6ba1c3661f3c0effbc5f1824b104a62ff",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html": [
-   "773a7becd0701454cd603a5c18cbd4a75e4c8b8b",
+   "cb6a6f119d1645575e6e383c10bd9d44d31c5322",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html": [
-   "a776f68c19bea1f8b0ddca572c30f561406d61f5",
+   "99b85ca13ed441989d045861ecef62771aa0d59b",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html": [
-   "862794d9937ed617bd54ac114c7d7c054f38469d",
+   "0fb1c87cb05b4fa7f47624235f06a1fdc50fd311",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html": [
-   "f02587e774b63ef327af6389ae42ea2a3edd68d5",
+   "e3332c01506477ea572fdade000809c92171f4ab",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html": [
-   "1fe0b49d5b73c5785687bada10e98f5a5341f227",
+   "57bac4ca139f7372f81c58a1ccc9f5e2d41fc8e1",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html": [
-   "4661e5463cc5976be914d153823f9e93d86748e1",
+   "f32749be834919334ba501a6a4beff50ec1b5d60",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html": [
-   "972e24a30ea2d3e46c4ff04cdf085e870e3fb8ed",
+   "0c9e0abd3030662ff168ed3822f7196e2d10d238",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html": [
-   "c092db5629fe6a2e8bfead95e666887142126bae",
+   "fa8d80bc64fe82c7ebb4d3c0f9197734be9f8464",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html": [
-   "4ed4a866cecbbbe3b76d90f5f33b61ae071fe06f",
+   "eb4cc3a2d9b7457c11cd37b78bff557dc1169fbc",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html": [
-   "8c6d47ec1d4e29fb0c059beb3d54a88f61042922",
+   "cf66130cc638c8cd289b1bd0b80724c88f690ba2",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html": [
-   "fa0114be1fe18220434a8be0825ad41e5df42e9e",
+   "25f9c3d290dda9d3bf7b185fc2bdc1dbd44f7245",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html": [
-   "d5e6d4a3f77fa4f635c57a979a269fd882002e40",
+   "f62e0efddf49114f86eb8fc76dcb8463052a70cf",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html": [
-   "fdd422c0715333fb46c1a68afc37fabb676a072a",
+   "7903fc88c901cb8e757ca1c66177b1cbd9b5da20",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html": [
-   "0a39f27976a8b3591294da6a25f617437dcaf85e",
+   "4294a65ed6b5225a2ff11916a23da9c7821a6129",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html": [
-   "d08edb1be3dba860b3bafe844356d0ff82e56be3",
+   "7e97967aa553f2922450cdd834bef2ee340a8baf",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html": [
-   "e8edaf554468090c6d43f75ddedbeac0647bde39",
+   "b8beff2144a9c44509b54fc3e037cf6f9bdc2233",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html": [
-   "c3b6c66b9d67de2b95fe8c295c4c28ed7576536f",
+   "25b092b43053222f976bf587c5b1db2cc0681095",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html": [
-   "398963dfe41fcb86f9ce705fa28816d07a129903",
+   "6c5284ea933e48fc30594a3062a0ac46f7ae9fce",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html": [
-   "f18a99d50326f130abd198e11c988a670a569a98",
+   "63435e560731ed68da76cd51d09c0cf557d27780",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html": [
-   "c8d83790059ff01737a55fd4c27edbea80f6657f",
+   "abd13effa3a46ef0387ef0d770fb167e7de9d055",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/a-tag/cross-http.no-redirect.http.html": [
-   "251ef53069993e09589148603957476695b73f4a",
+   "b82365d6329b38be520cd73a713256e8deea3bdf",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/a-tag/cross-https.no-redirect.http.html": [
-   "cb3e32825b2103142fa0992d2bddd5be8a37dcaf",
+   "a0938dc9df4c9ac227459b556bcaded33c73ea72",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/a-tag/same-http.no-redirect.http.html": [
-   "84160270242682ab6c32dc1284fac538cdd03226",
+   "a3403c55ae26a7760848b580a4657a46e7f5a8e3",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/a-tag/same-https.no-redirect.http.html": [
-   "045462b575886095ad3afa72102bf0836d9c4ff0",
+   "8cf2efe896d0d5ab4541aec4daf69336905f8e59",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.keep-origin.http.html": [
-   "06f137200af756e3eb015296182dec1c0c6039f8",
+   "ad8e36fa9f506a5a506fd7e56fba47e8892ae3f2",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.no-redirect.http.html": [
-   "a1eefb2dab144e10c414caac2e7b0ebdca21373c",
+   "e0136aaa27828828660841449b00760e6be893fd",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.swap-origin.http.html": [
-   "40ce944f4db8ad4e309c621a38c4b8534ad615c4",
+   "dc86b8ba604b199d15060515651eac678f414163",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.keep-origin.http.html": [
-   "7c544ce792233c1dd9c988951fac9f3446f384e8",
+   "fbcdcc936bb0174335599221787ba7a429880367",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.no-redirect.http.html": [
-   "bc1c75ca3c927f955c86af19a5849a191cce7149",
+   "cdac8ead93775285049d9449ec7d40adf9ce33dc",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.swap-origin.http.html": [
-   "cad9835a514a8d39bba2b0983d4fcbcbdd310b0d",
+   "6ab6b2c64259fdb900e36721280d8f45ef669db0",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/fetch/same-http.keep-origin.http.html": [
-   "5dc3e608cb523ff6aec362e5e70a97bc570a2d71",
+   "6e221cc8bfe5fb784247ae02fd8d0f5eb49a11da",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/fetch/same-http.no-redirect.http.html": [
-   "a6c4798d69842fda5c895d8c9bfccec93abf151f",
+   "9e29fb706e2b4d350dba307b31baf82cb3dbe9a3",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/fetch/same-http.swap-origin.http.html": [
-   "84f9933294ca351c7ee3950f8d365c2ca9834939",
+   "7e5a0cb91ef27d1bf23ecd2473f81f005e9d36db",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/fetch/same-https.keep-origin.http.html": [
-   "d0b4aa255d6b3bef8b232cc97d61e191f8a2fa28",
+   "4bea553a94c0e461619340acee768d6e62c175f1",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/fetch/same-https.no-redirect.http.html": [
-   "16160d687cb9f5efe33dbd45fc4b521cc9cceb0f",
+   "72b783f733e73cd8f79d33addada34cc83d0bf12",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/fetch/same-https.swap-origin.http.html": [
-   "0168534be40828348944847be80089f5b35f0764",
+   "9652e9ee9f021b59aecc2f24a530bbe92bb939e8",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.keep-origin.http.html": [
-   "c7418279fb8e9d0b9d9ba1ed46585aba66003203",
+   "d51f75b582fae9de9daa2fd55c6986f3a72899ad",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.no-redirect.http.html": [
-   "88bbb6f74d907df596ef7e4cf8cbaedf0d6f1c5f",
+   "6e6361f4cde04c6bca7f470240251a88d24632a7",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.swap-origin.http.html": [
-   "726cb8f47b6b581fd18253fe3372ac90003afa0e",
+   "0bb6615b7f1352f26b878697ce38cda1d2f132ef",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.keep-origin.http.html": [
-   "95b2888091ccb743c210f83cdb00911e34967f64",
+   "16e0a0979e7bdf963c7a2e570f5ad1c6e9933c95",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.no-redirect.http.html": [
-   "0a4a78f01c789b2a15d104575d5cb217e929f6bf",
+   "cc2c883d66df77080073db60561c10720f4e2888",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.swap-origin.http.html": [
-   "77210abfdf94f754c8df996d0bcf7de95f8fb800",
+   "36dc5e754be9783146025a3e0172da0cc9ad1c46",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.keep-origin.http.html": [
-   "f255b9dcd0ad595f93aeafa692fc0d06493a1fd4",
+   "2fec579a5b9693da1357d3167afde4a6ae45df6a",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.no-redirect.http.html": [
-   "620c19f11af970495763d6a1d3a7036f69584feb",
+   "0cb682142261a50d017e8d050724a678780e9b75",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.swap-origin.http.html": [
-   "6c8609763b3357f7a27c589e1f885c22ebf939eb",
+   "5e7edca5585e88e6075234ddaefd8f2fad5b1530",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.keep-origin.http.html": [
-   "b423313e644c1b48005f60971b351b2e5c927092",
+   "5c65f3e00bb824abee38994810861050932d74ab",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.no-redirect.http.html": [
-   "e686e40d4f01babe4f39cd5d5268f793c8f8d431",
+   "ab4779616b2b8c690a352c0f43e05e5fcfd0028b",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.swap-origin.http.html": [
-   "1087eb50dadf1b92fd4d91b2eb817b5068e3eafa",
+   "7b21011501eb06e59f827510d04d9f0e4067dc2c",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.keep-origin.http.html": [
-   "e09e61d85a9c5f8c231a0ae5ee3a9d2cca28d948",
+   "3b867e1c0e9ed6d85693d57354cc80f59314be62",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.no-redirect.http.html": [
-   "40105a66df4794dad8a12c4b904bcdf2a03b959e",
+   "84be9597065214e601566dc310b071b25478d18e",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.swap-origin.http.html": [
-   "273fe59a1772a95d2714b2a82a104e719749ae52",
+   "1110466f93b92b936641ac3263578ce3cdb63cd9",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.keep-origin.http.html": [
-   "5b6cb7d0d0fae851415b595300f30eb4c61cc2b2",
+   "ab93ca5545f2e7128c3973bebd92384e8413e9a1",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.no-redirect.http.html": [
-   "4df54d782c96a87a029ec50f18d035aa4deb1e70",
+   "9889ae09ae0c07fd225fbe01202741a52668907c",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.swap-origin.http.html": [
-   "66b10ff04f466e97e1cca39365eca7b6e87d4f12",
+   "e2aac2e290e2d71b4d4be4b8d090f327e14ea37f",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.keep-origin.http.html": [
-   "2024fa42bf444c9e346dc2770296617c290f076c",
+   "b4dde1fa54a8753e07ab5052e93ab1708a40cefc",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.no-redirect.http.html": [
-   "10962adc2f4bbedb397c44207414f21b567e7280",
+   "61157283e0d04236d74e2e75b1767d08d91f32db",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.swap-origin.http.html": [
-   "94f38db2bfa1ca8634109ce3197d92787ab0c699",
+   "fd85fb44bbb073f50e89b4d3764f26187dcbe567",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.keep-origin.http.html": [
-   "3710c1c96c72eea89488091a76ce61534d1a8633",
+   "4facdd0907685eceddd3cfbe14f3373ff067191b",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.no-redirect.http.html": [
-   "1914626ea29c5d57b0983af79fabbe40b390298a",
+   "56022784397336e21db5699bbd1b185e3f38d7a9",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.swap-origin.http.html": [
-   "f3c25498ad283238ff6686a505bf0e6aaba88c59",
+   "118ab6d668f19cedec06f17f7d411298d52e24ad",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.keep-origin.http.html": [
-   "bf1a4d6db3e907ddb6961ced100d13e78d892f39",
+   "10a75bd7b8ffe2a0281a4891fe07e9aea5788576",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.no-redirect.http.html": [
-   "c3230d10d654fa17a29c75f3346197b9049a9e4c",
+   "e556f69a24ab3cb5f1cc03e2397cbe014b7b1004",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.swap-origin.http.html": [
-   "0e35ab3a6a4616cdd1033cdceb2ecbc54727bf53",
+   "7672fb071fd4b8d98bcd323c45ac4634ee6c0040",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.keep-origin.http.html": [
-   "6ba7329d294b088524b3e917a01963ef6b1ea3a7",
+   "b0b9e88534cdc976d4ffa259bacdb2356fe680ab",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.no-redirect.http.html": [
-   "54cfa963d9ec200e9c444e96f5ea87560e634763",
+   "9ff93360b5dada5ba1b55176a30a83897b088c6e",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.swap-origin.http.html": [
-   "6961299bc519086d77d9f2d06090c4df12f50185",
+   "ee23beb5e9d06ab59a43eff49f1ddf0a0ce73b6b",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.keep-origin.http.html": [
-   "e2dc274d0e2bae196d568864326016502ccaf8f2",
+   "2f011e5d23aacc2a43fab02d099bf52a765cf5cb",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.no-redirect.http.html": [
-   "1c48443a6613abb25897cfeaacab62706c0dd49c",
+   "31b94f503481509792d5b2935deb1a3102f909b7",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.swap-origin.http.html": [
-   "c198959d7ed3fa64f8ed9e522c77acf8f5bb31c8",
+   "f004d3af29f995c05e62e1187bc4a0c150740d0b",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.keep-origin.http.html": [
-   "c77e12117a5cab03a2b19c575acdb7c96b3d2a85",
+   "58a295eb3ae665e5715b4c4e09a2c453eec1c6c7",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.no-redirect.http.html": [
-   "6a07112d04986c1db6d7709ea6e2e516e54520b1",
+   "6df3e8f3af26fc379b15f6225486d8b538f108b1",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.swap-origin.http.html": [
-   "e73e48068a411242074b0aa159e1e4d59896fbff",
+   "a184016ae7a510fc25a269955abaa9ac88f93fc4",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/sharedworker-classic/same-http.keep-origin.http.html": [
-   "b7dba7b8fe656f40c09250f075513b1cb1ea3586",
+   "4dea9a7c19c4e1bfd0bb145a5d4c97ec0d23453c",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/sharedworker-classic/same-http.no-redirect.http.html": [
-   "4a211294bf450d02949432269eb9a47e39e785bb",
+   "eb2572bbf7e398c31aec535d4642757b8f8ea752",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/worker-classic/same-http.keep-origin.http.html": [
-   "638c68b466507a59ae5cc22ef0d2b82a045eb3b7",
+   "46f300c1d7bd171f1557d94a5a44b216e44c57d3",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/worker-classic/same-http.no-redirect.http.html": [
-   "addcc15dbe35372b03d4fc53ade18a3317e89e9c",
+   "c4b07b27b68dc3ee5c83d991aaaddaa87c4bc210",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/worker-module/same-http.keep-origin.http.html": [
-   "98905fb317eeefefb4fb538fd3c0cfdb0e6e7c69",
+   "b0ac1c29b17077f853565221ef6db66b94c7a9a0",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/worker-module/same-http.no-redirect.http.html": [
-   "9c5dd969084f368afa9e2e6f58306a7e091bc646",
+   "cd1e64a30915b1d7927b62d9738f334b3832d61b",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.keep-origin.http.html": [
-   "741c874ad32f9e2e0592185dd99f52c2010dc4e6",
+   "0e9e15547d3b3d4f15d31f087ee75daf09909115",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.no-redirect.http.html": [
-   "b2e574c1d11425f7f6546ea0369930fe8acea936",
+   "c26dfcf033afa2df01306a570cda5989a1d3fd99",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.swap-origin.http.html": [
-   "8af9fd6eae46b591bdaf19101f69d487e9b2fa1e",
+   "bd586a443244ec913931e4e22ec9ee878385ef9e",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.keep-origin.http.html": [
-   "86e0d4eae6a1286e354b9127fc65401f15fdd54f",
+   "88959e93534933693ade0d41f42d3efaeacf9b15",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.no-redirect.http.html": [
-   "26460c3bd714cffe2549f53493f5909ead37bca5",
+   "be36467a4d79069bca90e706ba5c95a768dccf33",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.swap-origin.http.html": [
-   "c68cc7e8eda2621c85ab272b3c6dec9d1f8f3c7c",
+   "1ef6151c5c2e4886d156a466e1ac78a884c986bf",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/xhr/same-http.keep-origin.http.html": [
-   "950af0c61d4dde4d01149a84f66d0b9e4948f316",
+   "077f319007be26c6a9a70b260fa5932fac24e96a",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/xhr/same-http.no-redirect.http.html": [
-   "d4ae93bb73f4bd504f8ef0771a8ee14d3a647fe7",
+   "493064ecadaa045b6ae70e5dc8db75cf687f9b37",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/xhr/same-http.swap-origin.http.html": [
-   "98aea0772947451de7d15182340cfe7fb32abdce",
+   "37546ab43f000d94e4234a9b3a3f388ef3cd2bc1",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/xhr/same-https.keep-origin.http.html": [
-   "4a711f7a78b9695ae4fcf8030ed1cf5d5d4302d4",
+   "9a136ff3a7bd67e7a5a06865d194f52f71688780",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/xhr/same-https.no-redirect.http.html": [
-   "ff444343b8f92e79e5f8b8530a11090c811c65d2",
+   "4c9ca2c3d9e07941a173a93e3feb34abe280e8cd",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/strict-origin/xhr/same-https.swap-origin.http.html": [
-   "cf57a0a574a04d32cbee68d9ca30f42168239d92",
+   "13ff80c9f1361704facbbccf630f2e7723e41c91",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/a-tag/cross-http.no-redirect.http.html": [
-   "307e935cedeebcea0f9f07dd453bbf1634f0c604",
+   "2a4fdc71d6988ab38d5590012347b74a5463ab67",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/a-tag/cross-https.no-redirect.http.html": [
-   "a4529bcf1f6d3bec3b80bb6682d2adba6d037150",
+   "bee2563bc680dc12dcd7fbf44a46b2267e5d3aca",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/a-tag/same-http.no-redirect.http.html": [
-   "6c1dc71ba84c5fab0e081a8fe80366f5b6cb48f3",
+   "3cf7c4cfa0831245753b609ca7d37e8aa3d2b738",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/a-tag/same-https.no-redirect.http.html": [
-   "9431a1765244892aad8b589882e1bb4fd9ecbf49",
+   "5d31dc5a83923f1e04a85ec45a5ce6bd42478b4c",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.keep-origin.http.html": [
-   "5043a93c2069e1f5866da3ad891348b6477a2af9",
+   "9f0f73c6a1674661fdff78b938f318c677c518b1",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.no-redirect.http.html": [
-   "46ce6978ba6442e14f336744f39d57cf274cf6c9",
+   "f0b082be6e51b51727d6e010afd425d1bdfa8a70",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.swap-origin.http.html": [
-   "74da7c14fc1476cc88d9ef3209d87f8de9ad8884",
+   "7195fe93f6b36ad66a0faa15d26a503d5e4bdcdf",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.keep-origin.http.html": [
-   "ca6825c633f8b2c06b79b7c8d230e9e938a4024c",
+   "5ad161743aacf9a0a917a9d9275a3fd7ce9a57a3",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.no-redirect.http.html": [
-   "31472d6aebbfb06f1892ee6710f89331cb0724ef",
+   "9b6e6dcbb86466b595ad5f3ec898ebf83947032f",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.swap-origin.http.html": [
-   "2b83b4e7195562465e1f15e6b1ebc80fa83ba76a",
+   "71338b0907a698fc3513973318986a11e2aca9c0",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.keep-origin.http.html": [
-   "7d4734d6c7b98bad23b59834c1ab70074cb6f514",
+   "594f9d563794e3f3da190555419071261b715cac",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.no-redirect.http.html": [
-   "9dfa39e64366b9c26563cb9ee78ac7330be5424a",
+   "805c88d4d596b8ffdd4045e6af452d10d12b33e4",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.swap-origin.http.html": [
-   "0a8119c4d477676d4a14f82eb2838f94ebeea803",
+   "a356469f7bfa548f99f51cfb607448bfc66f0d7e",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.keep-origin.http.html": [
-   "6d3c2c9c55d3eee2cde9a6a613b20d915a51e2c7",
+   "3a117de740c1c26166888cb51a8bf0229a77416e",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.no-redirect.http.html": [
-   "267081a290d3b2604f731563878e20c864ab97e5",
+   "53897c4f2775fe47fff6e162a3f6ec721c9261d6",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.swap-origin.http.html": [
-   "8946815cb3b67f1f504d62f982b311aa199aebc9",
+   "956b965c6dd78cf4d9b9373915aa56ff0dc7bfda",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.keep-origin.http.html": [
-   "c6e13851e685f6ea8582a1be0b6a4fc98cab9be4",
+   "e7cc89cccd27d0673226af17d290db2a6bad2408",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.no-redirect.http.html": [
-   "4b82e5f9617f8ea87f90770177ba0930d8a419ea",
+   "f6231482cf0290c6d929c0a2fce9b0cac93981ee",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.swap-origin.http.html": [
-   "62b088b40fe73d6d45e86f27c0ddbb3e7325f953",
+   "f74efa1a6361278c222753e0cf74669f15591fe0",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.keep-origin.http.html": [
-   "18d27e6f9b2a58cab265cff3b2ad925ca4d4d83f",
+   "e04e26d6e799435d75c310e48f7b490990908d88",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.no-redirect.http.html": [
-   "a946796357692b662befe9f75905433405baecbd",
+   "3683e682dd04b4342fbbe7786fc861bf22824126",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.swap-origin.http.html": [
-   "d2d9fe9a68362b1efa28150c0d09654f0196182b",
+   "69f3a571d5c2d86faf75ab6b436c21f9a48060ed",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.keep-origin.http.html": [
-   "1a027047499e58d9b18264cee1dfa9075e027e85",
+   "a8e28bc7d69fa392e15858fc91738bd53fa8b405",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.no-redirect.http.html": [
-   "53bd45e5a29d9819b3fb9d772d0a453051f59620",
+   "2e7076e712d78fc5d31cc926fa97086c5f5f45cb",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.swap-origin.http.html": [
-   "7292fa7e65751b9814b2b617d01ee5c47c303387",
+   "6469fce2875724905862c6a02fc7e1cbd915ade2",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.keep-origin.http.html": [
-   "df3627a40295c0cb8675e02b9efdb911100e3c18",
+   "7f0d96d05e5a8795a563f5d236dfcc9d3ce8cc7f",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.no-redirect.http.html": [
-   "82854ae6b3d97585b9effcdb6b0e285129a4bcdb",
+   "f94e656a64fa1135512cd6aeead711b1ca7e7704",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.swap-origin.http.html": [
-   "bda4ac8f7a2a0670c2c49480707ab07c297fc756",
+   "55fb90e4614a8ad46d3fce92304f21038d86c238",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html": [
-   "dfb903d27a5d8f440e25f7527a931bbcaca20887",
+   "d0523254d79e5892c33f71f6a4af94f752067798",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html": [
-   "f755eb1e6b42c82655dc3d59f437a471c73b2f15",
+   "3d3c216767efe80ab1788352ea75c0a2e3c4defe",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html": [
-   "0f84802c7093369f5eef5dc86a88d0ba4eabb464",
+   "e09505eb428d92418e7fb8fbafc0f9cda76cc3b9",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html": [
-   "87948038d6252642c2b36260990c6024d716a679",
+   "bb12a372e85a2b5484c2863e1f60a4e839b9c7d8",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html": [
-   "01490d5a8b1c518e918cc4d7b90df8c1c2a27727",
+   "4505b348ff05a2b899e70c02160670b2f722a9f5",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html": [
-   "f5770d24910b75056ed8b636711905d4c42d030a",
+   "5f47b5fd49aee275b28ac449b5297a7f09dd35fd",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.keep-origin.http.html": [
-   "5ff2659e9f1a36156c0fbac2a2dc274106d17930",
+   "00d436a5077d02c0800bb6beb336efa15b3c4be7",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.no-redirect.http.html": [
-   "e8264215ef8b23f5474a5dedb3f37d5d90e45e66",
+   "7f6a1eb985835b59835adbb56e032d0fd31f17f8",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.swap-origin.http.html": [
-   "971da6f64ef28ff8d621285e37a56b020ed4919b",
+   "99b41223ea860499189b68a70280ae857bc0c2b9",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.keep-origin.http.html": [
-   "9f040e4c48d7d76f34f942c521628a7dcb50ea88",
+   "32f57765028b3bf8749d31e74e34a3d6744dc982",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.no-redirect.http.html": [
-   "4710141f4bb1d9c43953ea56b4c6734e73bcd616",
+   "1f57b02808b936ed91ce194cbfc63c530c5089f5",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.swap-origin.http.html": [
-   "2a89c1f52a6fff224b14e510db64d6ff2909562b",
+   "2bd8be3f3c256e62d41d3de5aa4095e76bc47134",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.keep-origin.http.html": [
-   "aec7c665c6651b90fd7c38a0aa7e69b0272beab0",
+   "8bd7b97ff6b116dd334a25d681ff0236614ee1fe",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.no-redirect.http.html": [
-   "7a0821b7e837be8d87efc60e1a0d5be8f91362fd",
+   "217100684005b559b96595c1f4ed420ca862f162",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.swap-origin.http.html": [
-   "6eca4e51c92f71c79305294829f6c7b66f90f6fb",
+   "302b9eefc1a055931453cd6161b2d12210ae4055",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.keep-origin.http.html": [
-   "f5dd935985453174881bd635a4f41c4502de44b8",
+   "f6bc803e80bf4b02193a72ca5ac2afec8d773643",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.no-redirect.http.html": [
-   "a6322387413c083bbf4fee22d473c346a66370c1",
+   "b3188ea43157338cbc6f0b3c29a4d2aaf2a814bf",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.swap-origin.http.html": [
-   "fbc8b77ab378e84a8ade6d5f808828f6bc754bcb",
+   "77f2ddf3df6a364258f0543941fe84e1d90e8af4",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.keep-origin.http.html": [
-   "680b2291e2a856ef891140022f000fbe1f2656bd",
+   "877c18a7c09fab8921509d1958765965936f6530",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.no-redirect.http.html": [
-   "cd0494a52c15fe3d27954fe9d727a789c1b1cc16",
+   "2de7eef3ff3bc39eb5e4be73625dd927d1cdf6b1",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.swap-origin.http.html": [
-   "7411f8963771ed6c5567b05fd1e5de60f0495468",
+   "99c31df1f08779efcb388f36cef6c1ffc6fbd0da",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.keep-origin.http.html": [
-   "ad33638d07ee831869458588587bdf64cf40443d",
+   "c1998fe5f1aec61fe0fcd5442069cc86235bd623",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.no-redirect.http.html": [
-   "73eec5a88e32c5916c02df23cc6e1353a6b6b5ea",
+   "c2f7da5b355779dbe43a0b11805ff46aba93214e",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.swap-origin.http.html": [
-   "cc46af534f15cd3a083a5b48e47904399e61d9a0",
+   "5f8dbc6f2b8b32c5b5de5d1fe317efb6bbe84ed7",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html": [
-   "7dd104cfd83c06b0fdf0f1522d8e6e2b656bc76c",
+   "f3cead810eb99562aaa9ddfc829d8e1d6e7fb4b4",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html": [
-   "259587c893d0aed61d4ebab831b4db3481f65fe6",
+   "a891328397f6994a9fe7222f7e9d6cf6161479cb",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/worker-classic/same-http.keep-origin.http.html": [
-   "c18924d61f9b819726b83381d10c4d06b6ee8920",
+   "5f642933acdfe3b689268706904963204b3bdb6e",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/worker-classic/same-http.no-redirect.http.html": [
-   "420f475af40dfe42f8093841b9c1a0b20ac0cd80",
+   "b93ff265ac6bcb80c532247baf6b73186ad08019",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/worker-module/same-http.keep-origin.http.html": [
-   "97d742885e9741deb17501f8f3813a130b005c85",
+   "98f39536d14c131f8d2f3571724c34ff31997592",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/worker-module/same-http.no-redirect.http.html": [
-   "84dd2dbf9863c4310905fc2ffbf8bc836016dd8c",
+   "83322269976f2b5cb585f23865facd36ea5cb063",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.keep-origin.http.html": [
-   "2b915db9b2c902ba50afeefcf37202ea0d42d59a",
+   "e2a56f0b063a2e7d1c3d3e0df09d1c4d6e69d479",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.no-redirect.http.html": [
-   "46570c616b3ef3f352c4ad33dc36a5aba28bfe7d",
+   "cf7cd16db2ffcd3f35153bf7bc20ab7a952126d9",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.swap-origin.http.html": [
-   "70a9387b596f0c56343ff94f8234c84d397ced3a",
+   "50db0f4132d64fa1b28e83829d1bbae1010db2d4",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.keep-origin.http.html": [
-   "cb52ad0c3b3d5081be1e8c19b13a24a6734700cf",
+   "4801f40d15b9be850e8335d93a0a6b8a1d26ead8",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.no-redirect.http.html": [
-   "4d23b5b1fe521bac9547846151163f7f2c30abe1",
+   "45832d20c91e4a9f3f8ca807d5c2c749332eb6aa",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.swap-origin.http.html": [
-   "08cdcda64f00985bbc9a838e591bee8cd0955b1e",
+   "58816ccaa324dc300564ce2ba7b0e978084a3867",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.keep-origin.http.html": [
-   "0a9468a5cd5c9c4fcc7a5d01f406ce471b87a87b",
+   "23a6e691d4e08118b61ee6f868dd1be15a9fd1af",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.no-redirect.http.html": [
-   "907dfe46189ee783dfe037bf30f857ca061b7c7a",
+   "20e58baf626f958bc249bc89b0a517a858cd06b3",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.swap-origin.http.html": [
-   "0bbd06efbf6c7e9bb7b965d27b14e206e9c08ed9",
+   "1f87d92a8372b7cb666ebd22022bda5c3ed53ea2",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.keep-origin.http.html": [
-   "a90ea834061b1ff2b80d519b250419db6eff8271",
+   "99b155b87f577bc4889e3a115b5f3d372eafff83",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.no-redirect.http.html": [
-   "146bef287f7af9d2cb5d916713ebceb84e8431c6",
+   "c0c2a3374db816e84ed0f5bc3fc5f93c645c5f79",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.swap-origin.http.html": [
-   "dcecb0d1fb07d418d787540589e652f466a2793d",
+   "f17303f9669270edf5e7035d8ab6473523d0c0bc",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/a-tag/cross-http.no-redirect.http.html": [
-   "7b76180b1280f6a33125b03fce289bdc75644953",
+   "911f16d5eb0a380d9872009e72c1dbf37785ec05",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/a-tag/cross-https.no-redirect.http.html": [
-   "ead7efc96337c66ce0e2eee97bfde5fe0fe6194a",
+   "9d8064ff8824f76d39783e5ed33b44cd4549bdef",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/a-tag/same-http.no-redirect.http.html": [
-   "0350e03597cafb7582f73dc588d416ff72bd1e4f",
+   "cdaf18c1d258ca92b0003c73992750caacb0f171",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/a-tag/same-https.no-redirect.http.html": [
-   "be8155abc71a036396917321e18c17726eb740b2",
+   "9a6c2b43a8b2586909c04037ac3f739f48f8f28e",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/fetch/cross-http.keep-origin.http.html": [
-   "d6dbf7c38f52cfe136a313a225452e25fe9582d2",
+   "7fa2a77de9ecab2667301d865f73b507f56ce2e7",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/fetch/cross-http.no-redirect.http.html": [
-   "d6b7b1d4b2303aec7eaef620e9573a827b4f6d11",
+   "bbf1496d07d2e4f04840b7cca2b2f867846b2d10",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/fetch/cross-http.swap-origin.http.html": [
-   "228bac96566b97d482a3a0c209c8ffd23398be51",
+   "989c7934ed037417ddd3b30cfb0a1c02a78b427a",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/fetch/cross-https.keep-origin.http.html": [
-   "23a5dc696034e3ed1b4aa9612befdde70ceffa32",
+   "7a596e7f8067e35bb985d23f7aa9aa31432538ff",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/fetch/cross-https.no-redirect.http.html": [
-   "2b950c4a6817da9151e8257f3dd0a9ebfd733253",
+   "bba5c2a55a730992c6d35c94a3459f4f6347b276",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/fetch/cross-https.swap-origin.http.html": [
-   "68d8dddf59d0f84badd8a98bfd25f1123128676f",
+   "867e64067baed1620991e2d78539b88775bbba65",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/fetch/same-http.keep-origin.http.html": [
-   "68a2919245a5a9af207ff6e133ad2ef2b79663d8",
+   "5e004ab58926c21d8a814fc0d6c99f3aa5f2e390",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/fetch/same-http.no-redirect.http.html": [
-   "9786e115f4534b5e06316dd5f66979ea1331e25d",
+   "94176020e8685afc8595bf5f877d23194f98bf4b",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/fetch/same-http.swap-origin.http.html": [
-   "aeb97a127123950647fa69cb3165a78046a741f3",
+   "82b9de5fff3968b9f7a48afab8d69d3d33849cdc",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/fetch/same-https.keep-origin.http.html": [
-   "27bf0fb382512b9a19f1b45c65938ae91d7b2520",
+   "20be1f2f6568282fc23a9ebd44aa84f7582c68ac",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/fetch/same-https.no-redirect.http.html": [
-   "f2de2eeabfa438844b97856c9ea1376e1364524c",
+   "244623b424cd74ab05eda215488f391874e38f2c",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/fetch/same-https.swap-origin.http.html": [
-   "2f059b49d6c0a9dcc9d9acb82472051ac2e71ce2",
+   "fbcccb86bfd334a720399e7c0ca4b701326c2c14",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.keep-origin.http.html": [
-   "51b796faff483aa283c8dde74d464f1d3bcdb66a",
+   "d2ea91e2d70ce9023879fba6c5e8378166966a7f",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.no-redirect.http.html": [
-   "ae910ab09dbac0a7d233294f4181b11f77592fe4",
+   "1ce5e1167c3b1695e83ec05a38d8e5ef8e067910",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.swap-origin.http.html": [
-   "6b96a09c17948d56e14b645c43754af50052bfaf",
+   "afdfbaa439267de54b580f58e57906c942e5deb8",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.keep-origin.http.html": [
-   "89eb976029d84b8887f4d299b7b1c6c378a15f4c",
+   "76040acbbdd655cd789937a4b9d058041bf77407",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.no-redirect.http.html": [
-   "d099040c32c19bfe2fcc12a459f28a6d60c798ca",
+   "0f31d22b62675ea623ab185463abb80a81d45f27",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.swap-origin.http.html": [
-   "026635498c02397a0d2b8666219fc47bede7b310",
+   "41626c4de9873079e97655e625f6a90fdeb940ce",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/iframe-tag/same-http.keep-origin.http.html": [
-   "a88a0727bf671469a2d33f99c869a0d02fbf8f6e",
+   "a0252bb469879486bb8deae6d7b0bbe4386755f9",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/iframe-tag/same-http.no-redirect.http.html": [
-   "04cc2e35ebcbf0061e62dab71a1ae4279642ec57",
+   "1c1193812145543a853ae0e1314a8d596c906376",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/iframe-tag/same-http.swap-origin.http.html": [
-   "c877963cb9afd648229b8b5ff6179bd0fb2cba4f",
+   "764ffe53f4bb290ef7057479a85abcd05f4e43b7",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/iframe-tag/same-https.keep-origin.http.html": [
-   "5a1af89398747e0efdf4265d8b9b79ce91cbf1df",
+   "5cc8685d8d72503700921fea1114a382cbdd7efc",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/iframe-tag/same-https.no-redirect.http.html": [
-   "4c9fb03cd2b73cf193f3434121ef236c4353def5",
+   "4743875860b357c35d92cc67cfce9d9c6fd61682",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/iframe-tag/same-https.swap-origin.http.html": [
-   "d9ab586df6e6e3aa449ae6fae082f670c9b9612b",
+   "ca673fd821e153a13c7e6ee24e0dd6de4f718036",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/img-tag/cross-http.keep-origin.http.html": [
-   "9631d810efd2c0b2d7127ce351e37a4b5dee9d8e",
+   "b9ee419b2c510ab4b97057a424ea8f41632b7469",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/img-tag/cross-http.no-redirect.http.html": [
-   "6e03cdab423332817281306be15546db7fcbbbe4",
+   "95e968cd67d788beebcc10764623e37ee9c580e7",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/img-tag/cross-http.swap-origin.http.html": [
-   "f3ccb1f50425bd99ef3a968dfa6d59571f0c4db3",
+   "8eac9af58b6e08eb38826bafd7157ddff927200a",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/img-tag/cross-https.keep-origin.http.html": [
-   "27266df1e4758381e35767c4ae1c5a6852eb6947",
+   "6483c72a3e2b719bf3266b411e6e74bb64709200",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/img-tag/cross-https.no-redirect.http.html": [
-   "7299286879b5e7e3204f8b1e885cf13dfca3d1d5",
+   "3f32c6b4f9c7d8505cd5c03761117797e655f0c0",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/img-tag/cross-https.swap-origin.http.html": [
-   "53ae37b0509db25a84feeedb79397677251f6cc1",
+   "1dfd817473f4dfa606510cef5ea76fa62882b844",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/img-tag/same-http.keep-origin.http.html": [
-   "bb0fc8062f5cafe2f16560e03c5136b27e9050d6",
+   "4c6a93cfc28cfb45840312637e01ad2b705afc19",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/img-tag/same-http.no-redirect.http.html": [
-   "6d4ed57e23c2fb495d56d641c3316bfe9060521e",
+   "c0411dc5651e9986d6baca189fe8f867d780b7ba",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/img-tag/same-http.swap-origin.http.html": [
-   "719a6354f27201757448d7b00d76450888ff269f",
+   "d67e02ba7e4703256c39009d884822f07a2279bc",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/img-tag/same-https.keep-origin.http.html": [
-   "c39fdd14a4409a3f9cecc4a616cf55460f1c870c",
+   "6e90c0f4b8c0e21fab3eeda8cf8679c8b4c64190",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/img-tag/same-https.no-redirect.http.html": [
-   "d594f8b75eb7c4c150e52cd933152f0064d67ac6",
+   "9f91b2485eef9d3a97ea0d8b0b5e4ba4c6de0d84",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/img-tag/same-https.swap-origin.http.html": [
-   "2fbe12fe8a8292d11e8d95a0a8ea9c99d44fcfde",
+   "138f3358bd726c42329dcbb1391d714fe8cb723c",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/script-tag/cross-http.keep-origin.http.html": [
-   "2a587ca4b11f08295a64404098925575b885f7d4",
+   "78ece0b19b8cd9e61059750f5a64d1f1d2425f64",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/script-tag/cross-http.no-redirect.http.html": [
-   "d0be10f9bcd922d7c712c91f8aa63e88b01bffbb",
+   "7a5879d9125157403db4d50ae6a9e71890e2d8fd",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/script-tag/cross-http.swap-origin.http.html": [
-   "85414f14de313adf52a8b1c0dc5090ffa43b64db",
+   "9d3381830e49b0000fb45285c87f81def3abbca2",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/script-tag/cross-https.keep-origin.http.html": [
-   "ec3dcdea3417d91b5dc59a42982a15c285d9b3b6",
+   "55e030b820dc91e3e8af2e662a9756b88af25042",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/script-tag/cross-https.no-redirect.http.html": [
-   "196770f8da688af4acbd0cd2fcbc233efae50cb4",
+   "3827e7a5c51bd00e844053aad53d80472fb2165d",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/script-tag/cross-https.swap-origin.http.html": [
-   "151d87662ab606881613e0cf9e06de47b15612d6",
+   "f767e02e2f049824443ec1b8ac45bd4a99b0f2d7",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/script-tag/same-http.keep-origin.http.html": [
-   "c186fa19693386ae0dca6d05638ef11b91c6bed4",
+   "0c2128b8c165e4cce9420cd51ed0b8a4d9a1c5fa",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/script-tag/same-http.no-redirect.http.html": [
-   "d0c49af446fe311605b061700e8a0582acdca03c",
+   "56ba08f9a4b033c831e255ecb57291763edd6ec8",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/script-tag/same-http.swap-origin.http.html": [
-   "594be914a131f43b828a88b58f6824a039deb2a6",
+   "8d2bb23f435c5d8f82e92bdfc95a5fcfe991da7e",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/script-tag/same-https.keep-origin.http.html": [
-   "f0acef6c59e420274449f9ce018bab1186c61575",
+   "b6ac13a209828872af809d98b1e001da6722707b",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/script-tag/same-https.no-redirect.http.html": [
-   "569f8c1ded69f5bcd7030c0506db009e80f01c07",
+   "9f2e599719c99e931f2efef7fcbd000a56c1a842",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/script-tag/same-https.swap-origin.http.html": [
-   "c027bcd884daaa9a899cea93af2d9526416d6a3b",
+   "8b940c905e97d4ecff62098c05f0570bbbd8f280",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/sharedworker-classic/same-http.keep-origin.http.html": [
-   "6e6160aa74a81e72b92e65b33a363987882918f3",
+   "1f4d8c219fef6eb9a2c4c738afbb9b0c24c22279",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/sharedworker-classic/same-http.no-redirect.http.html": [
-   "03b0a5ecd0c9cdb87712ddd06c335b17acf47acc",
+   "8cfd6e34217d415ee1ec505bf495866dc1d60123",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/worker-classic/same-http.keep-origin.http.html": [
-   "9c1caa904e3b0f7b47ad7de330309af282316caa",
+   "6fc428e4dd5f2a590ba46a58dd2a767f9fa3bca6",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/worker-classic/same-http.no-redirect.http.html": [
-   "954ed8fa62a7dddc88f227cca83512cf6c2fe8e6",
+   "1609876cd6eff6f3511f5988bd353090a487b475",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/worker-module/same-http.keep-origin.http.html": [
-   "dd8d5e5810468a9853d033dfd481b8527333f89a",
+   "f1e900f684aacdf8c17863dcc1a1797a67b68a21",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/worker-module/same-http.no-redirect.http.html": [
-   "282912b7da492b02c31e60eecb3891756976e555",
+   "ba6fe6d2e21e953eaf455fc4be9291766ea2454e",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/xhr/cross-http.keep-origin.http.html": [
-   "71192894ceabdaa457b92e64bf9e6eb955b4d158",
+   "4b2c48698ac96cefaf563386a7083e286363d82a",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/xhr/cross-http.no-redirect.http.html": [
-   "60033300dd752760cb031a36ffa55fa67c674a16",
+   "9a7052570782c8d15072e53ce091dd2783356e95",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/xhr/cross-http.swap-origin.http.html": [
-   "be62704fe35525072c06941485f54ec4fe40ad2d",
+   "affed7867a0c7d79f0c2320a1d47abad70f7b6dd",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/xhr/cross-https.keep-origin.http.html": [
-   "7d4131664e85e23dd649d58be46b68d6a5eded3e",
+   "70893f732ee70ab5083f956b14796fe8befbe565",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/xhr/cross-https.no-redirect.http.html": [
-   "84e65d398a13ba0ebb94a4c2644c39ab9a38d2a1",
+   "b51c293adfac4d0b9007d913ef290a18a839d83c",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/xhr/cross-https.swap-origin.http.html": [
-   "1b7e54f4ff6066ed54bf63537ff595c601bf9367",
+   "242a50ca8cef872630eb1ca8abdd036ec75e3323",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/xhr/same-http.keep-origin.http.html": [
-   "9f3d16e85d2fafb49f8797b96444ea6fb176b518",
+   "e48d5780d19f20d630aabfa5356ed9d61aab4c98",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/xhr/same-http.no-redirect.http.html": [
-   "40cd238de98beb11dcf933072ae100cf38c8b1a7",
+   "2a116be07770b5247d8bf50531e50f80144721c0",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/xhr/same-http.swap-origin.http.html": [
-   "a912773ca20aa4724148a3f5a7ae1d00eb7ab6b0",
+   "6dbf270a389db0e4a530534388e01da7948135d9",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/xhr/same-https.keep-origin.http.html": [
-   "b0eda9910fd947e6bbf40f3be1bc9c1139e4736a",
+   "840f039a2172835a862e71ab56b81150586069de",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/xhr/same-https.no-redirect.http.html": [
-   "ecfc6a58475f6556cf93eb2b913fd8076fe0f86a",
+   "8a66808cf18b894f58a5b9422c15cc43f170bc82",
    "testharness"
   ],
   "referrer-policy/gen/top.meta/unset/xhr/same-https.swap-origin.http.html": [
-   "c166e90808a46ce549c19ec7e918d55d37a1ce7e",
+   "957da8954e71bd5a18b34010e5aedba9dce4ca79",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html": [
-   "66b6fe0b7a557e9de01074217a04195527843a05",
+   "9155d66f626d20987fb26829021563f69dc3100b",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html": [
-   "51dd83fc0d80218b1ef6f1fadff2ee719128141e",
+   "5c9c66f16d5868ba05e3d3e8d9c37b795d037872",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html": [
-   "c1e6a7f30129aca29b65c9211ab3be6f29c8da33",
+   "0fef98fe67da3da4c16d6aa048c40b85b228884f",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html": [
-   "f00deb6846230e5f6ae24736f3c43d9fbd3cfa60",
+   "a25dc4bca74fd5c44747399bf45d0b4dd64633a4",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html": [
-   "fb61f41e54e5e791b4dd0cf9e187473a2dbe2721",
+   "071225581fddb413abe35233209282d082f0184f",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html": [
-   "856a6ff338c24845fe92fdd9479fbb456fcabe1a",
+   "ad37e713876a1f85a10bafe4523068abf034695a",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html": [
-   "5770833861abd2707db1737fe6bfa73cbd003593",
+   "9a0f5015ceed0d7832d759c478a3d2a6301e60c2",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html": [
-   "885af714433226ed9ea82d326291ed359afb4d76",
+   "a8459d5fb5fbc154d71c8bbd8fffb65738194942",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html": [
-   "36c1111776bbdb77ff5c4cda9e9f1797637d097b",
+   "f2ddc795a2196e05e9aa9e1e3ce9e9ae77a78212",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html": [
-   "a6419941f8eea8325a745f767bff2fd9fd78be5d",
+   "9f1006aef87b0a645baf567feefaf9be150f6f7e",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html": [
-   "be30b932ed4feb1d7dab2bf64d465960995d3f72",
+   "183bb2d026468b6e67ffafc6ceb6c92d1afe0846",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html": [
-   "b97708f7ecf445466f1cab9f4ca1e97d92b1ba31",
+   "cca7a26a7681024212b151c865fc344cd8dc15ca",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html": [
-   "01332cb58cdd1c44287f68814ec707e68fc096ae",
+   "bd9a2d5c70f9b1c07fa06273f810ece0d43b8cb9",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html": [
-   "62443f00545915a5ceefa027f4312d8379e3aed1",
+   "61855c8ae1c5e6a897cfdcae00c7b1a993ddcb6f",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html": [
-   "a409f58bdbd5ca2683e69b8e508fa68f5f2b5ba0",
+   "adaed5b58377c0f0796da8183df5c966529500a5",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html": [
-   "80f568bbec0229bb154830bcdc91fb9d5e9df0fe",
+   "7f9baa95389ffa16f2cf79ce6042f39db26ee88b",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html": [
-   "b56c1d08080a6b1f00fde120ee008aa9661e673a",
+   "23b7d34dab06236b874819b5660b8fd2a1872816",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html": [
-   "c2905e353b86c845cbc9ce07bf439fb523b1ec24",
+   "09f8edbac1d03cd30cd82d14173a4fc17dca6918",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html": [
-   "ef37a650f28e8068fe9fd7624277d9deb7551841",
+   "ef9d2149c5cf8af89e47ea4368167eef566f5ebe",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html": [
-   "1dd564973cf05b32e64c8a73823ce34b1b3fc466",
+   "a2be318d79e040c419a18d87481a103f9d850f5f",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html": [
-   "455f21a7191a3c921831430a62c40fdd3707b85b",
+   "2f948f14dfefd921e22c80f8cab7ed90092cd7e9",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html": [
-   "3e18a014d0fcd3f6ad698b8156c029ea08a288c1",
+   "c0e668862abc1820f8bcc2881e97522ebbcda579",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html": [
-   "1d18b76e328a38fd1998e785a5fb9c3d58023844",
+   "3ab9e93757b7c048d13a2d8b592208f4ae781fef",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html": [
-   "e2ff9ac8b48641a113ebd42fba45ffa546f76978",
+   "7c4c7efd405dc85376f205adc28a949937421798",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html": [
-   "8a013ed39f6de31e0ffa8d07dd7fefe22d0fa7f7",
+   "d166e4f69c69c66f020d058fb33c11209f89eb24",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html": [
-   "24018ebeaf2af35ef80d7fff0538a13b7524725a",
+   "a028e91e640e479854532c7cddb143d1a2746085",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html": [
-   "1d85bec82228b7937b8b1cd105db14a280ea28db",
+   "357578781d325061c7ba3de767707edcc5020a0e",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html": [
-   "6346b6628dd4f3f684c1c702dbbc26931d243717",
+   "aa633b2a9d940f09acc4f340e219638d78e9f089",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/cross-http.keep-origin.http.html": [
-   "6d20528d78bbad64a544ccb34e83a21af7daa124",
+   "e86c12f58cddaa1fbf2cdae45cd97cd4fce35f2c",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/cross-http.no-redirect.http.html": [
-   "d5d61b9fc03b9cec415daf28c0355617f894317e",
+   "88600b100b5b5dc3334b9049f8adf7604fa8f007",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/cross-http.swap-origin.http.html": [
-   "bcc5b710ed2daeeba3714f012171fcde9aa5a430",
+   "df3bc910335785dd56072eaa3d654e35a8b272d1",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/cross-https.keep-origin.http.html": [
-   "ce32dca4677e0a3c77e30b0e4927f67097511f69",
+   "c9906db455dc7c7a7adaee239a4bcc15ad6a6853",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/cross-https.no-redirect.http.html": [
-   "1b25245c711cdb5c4c60c06e353b48e788a54760",
+   "bd793aea9248ce9eb824aaa167e9ec0c6e6cfb30",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/cross-https.swap-origin.http.html": [
-   "b796645861661d3feaa60f8957a5ccd0512a1a38",
+   "1aa6c9228a684690ab883537d455c9741ff764fa",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/same-http.keep-origin.http.html": [
-   "3fba161030d7c805b7a8ff37e6e07ddbfe556ee4",
+   "0b62a4d6be90adaf4070fc604d3e5b380058fd8d",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/same-http.no-redirect.http.html": [
-   "61ef726b8273d2adc27e51b40d1f7dd712286666",
+   "c4e022b0db3242fca371602bfc2ca1357644d61c",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/same-http.swap-origin.http.html": [
-   "bcb47eae284c55d7b3ebd4acb56b3f5fd8b8c5ec",
+   "33dbd3f7bc0ef5d2a3c7884b5515d82f2547ca6e",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/same-https.keep-origin.http.html": [
-   "80f998207b3b046e13787bc5aaa4af3c523e464d",
+   "cd721294d4eb5bccddcbc45ea215ddd5c60de869",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/same-https.no-redirect.http.html": [
-   "1fddd37aa73a46cd10bd96adeef2345568bb8f02",
+   "d3e39b2b95e665f454db39a75038c97fd84a99fa",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/same-https.swap-origin.http.html": [
-   "05c57e5182d9652c65b303479edb566880acfb0f",
+   "992381ccbbce3341504418182a46b5be01cb8d1d",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer/worker-classic/same-http.keep-origin.http.html": [
-   "ac7046bb63231bb9d246c33e4da0da1af222ed1a",
+   "83e7f88061e69b3eefb9ce47b71acdd6ea4aa90f",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer/worker-classic/same-http.no-redirect.http.html": [
-   "7b9475d11f0dd3bbd35baa66df47119df6cd4d90",
+   "dcd9f19ae2e447491ba1b4a01d4893ccc069a463",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer/worker-module/same-http.keep-origin.http.html": [
-   "ca92181460a42123e76feb4c08c0908cccfc7948",
+   "921e110ea9649ca0bcc3e74925b9e8e8d31f6199",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer/worker-module/same-http.no-redirect.http.html": [
-   "ab43f41d986897dc1da368c962860f4c9fda6cf1",
+   "ea030d97f9d4348af2c2f7c4509d4419fe26649c",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/cross-http.keep-origin.http.html": [
-   "d7c2793cb10f3dd9a7ca6fc71f539f9a2a94bf2f",
+   "31976ea3621f71c342a4cc4068615f914a6d86f7",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/cross-http.no-redirect.http.html": [
-   "e5acd9251bbb26f4003c5efe87a5c178993c505e",
+   "cf42536b8f93fb49f4c5aa10664cb7c3e408af8d",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/cross-http.swap-origin.http.html": [
-   "e02c2cc1d7d39115ed9ec029019680592e1e255b",
+   "bc8e6e1c3c6bedd7b29d3cc806239e0b4f51f7fc",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/cross-https.keep-origin.http.html": [
-   "7b19f5ef08480da8722771be1178de47252c0937",
+   "ed7f08080a407721129dae6e363e7683fa34c511",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/cross-https.no-redirect.http.html": [
-   "da274023e02ee3f4a4c1ced6daf91bc3e0336b8b",
+   "1f3da4826b6d6fc1fe415bbc49a9393baa0f4b01",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/cross-https.swap-origin.http.html": [
-   "d29c4099a709744bb415fca1b043342edf4dda6a",
+   "d32552c844845d48485838b6d20259504885b792",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/same-http.keep-origin.http.html": [
-   "aba84b4a8543eed8f8fb2ebe1b4530f283208b7b",
+   "a495c7fbc6ca2b27617701e73c98844d83d8c542",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/same-http.no-redirect.http.html": [
-   "e3a716d2eaade2af899776c4a3b467dd4f6a6101",
+   "3595e62cf816a647a9b0ad6cd0b0ee570cbf0e1b",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/same-http.swap-origin.http.html": [
-   "64e3aacf93976312dbc8410cb15a0a4577f8430f",
+   "5af824ea04b0f17cd99f48e463fe27b8d8e9d102",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/same-https.keep-origin.http.html": [
-   "47ac8644c8235b81ee9d531237fbfdea03a26146",
+   "876fcbb2a2cd06ba7c273625fe67b0dd15cbea00",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/same-https.no-redirect.http.html": [
-   "9fa82acf6f9e422adeabcc2f53a88a78c9fe2ee4",
+   "472b8fe80d395f78c788094eaffdd3aed2a3a450",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/same-https.swap-origin.http.html": [
-   "de5f54a16a6a3506947d434d37cd54387e312359",
+   "1ec110cf94d5cc1e5f6c7fa1bd1a3cb602a18a17",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html": [
-   "8729b063dd777221a2b818eea31448c8623f0b45",
+   "f8018f14ea0654a32ac05898da9925521130040b",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html": [
-   "51c30f5bdb6829a562b5d34d13ddb43c917114d5",
+   "3b168c302b9b1251f51e3672f7189b1b918d58a1",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html": [
-   "f2b7d748e985770850a002a81b5d4a6862bfb2e3",
+   "014a32befff32dc82431b4077c28a94dfafb5ba0",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html": [
-   "aad980ddb237131dcc60594013b404283ea2dd69",
+   "466255e088d19b37a22800d347ec57e32ee4e986",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html": [
-   "3151188ff10807026166cc8a645aeced3fb2496f",
+   "955da21b7b19814dc1518508065b8e3d3fbeb9d3",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html": [
-   "024c17fd303e958d03673ae28c2116d9a96e601d",
+   "bda42a555551313f5cba0c2eeb7aec3c3848a81c",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/same-http.keep-origin.http.html": [
-   "8d0d4033e3c9b28be268cf351e89314c1f082d79",
+   "9cc5997d246c69a6ee36e25d01d6baeb963b5b09",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/same-http.no-redirect.http.html": [
-   "59bf06dce833952b47092e745b35500b89e14537",
+   "450f215c07e3d847205f2f6ab83b79e178d77924",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/same-http.swap-origin.http.html": [
-   "53987a6041a6092631269e6cd104d03350a5d4c7",
+   "724579258ae46fc67606ba94dc6e4f989570175c",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/same-https.keep-origin.http.html": [
-   "25612bba9178ddfb6a78a6024d277833c79bee6a",
+   "15dc1ba046b43254702bb4542048ed50beb02b73",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/same-https.no-redirect.http.html": [
-   "e9b8e78ea4f38564ac444d67bbf0bee9bcc27ed9",
+   "3f7f91ff8948fb0c1ccca62d8bf4edd4eeae7cf2",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/same-https.swap-origin.http.html": [
-   "0e1c1f228138a258fb78630211ca7effdac226d8",
+   "24ed5b1838e4903fdd6d4e95175e420667055c51",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html": [
-   "c3e972ce8d7b4b42f662714457f3beb296c29c22",
+   "f0ff87db9f3b4479e935510061303e51aee66203",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html": [
-   "425fcc2a6c3d49f9b4ba9d447502da9ad29d9c9c",
+   "323c47ec095b8f20a7bf238747494cc6bb74f3ca",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html": [
-   "485ac3f729f92311f279687e3a9296fcfb204f93",
+   "9c45c78d89b68fd67e6980bc6c4f2eb139ac7b35",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html": [
-   "5f61a1ef72e8d91d170dca32487e0becf22b436c",
+   "f4a20fe205035a014f263714b9e453e81a8dc340",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html": [
-   "c3b65435854a8bc97f7e449571395fce42292df8",
+   "558d114bf0d250cc84d1d2307adc520d5da4dcea",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html": [
-   "83f9788e2ba5d4f1437e3206f7d8d9b2548755d0",
+   "7294a748b831ddd6254873875aa68ec20b717388",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html": [
-   "ffcbe9fa729185b7b2806b79cb1c1d826edc3fbb",
+   "3aa1f93147c214dd06b463ddd0261ce12a6b0d38",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html": [
-   "59107ab67865c739548bd38221ae2b5c740774d6",
+   "f6cb8e7ed788c7c589e792ac580cfc39b47c8f91",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html": [
-   "a7c13f14058d6995f97dd5ebf7893c0d69d8cc13",
+   "3e5c7010ec06d7ce51d0ac32ae4c63b348549417",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html": [
-   "130cdd6cdd66f841fc9070491742b56cf30fe02d",
+   "a5f35f9e52899a13eb5d10508761a953d1ef20bf",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/same-http.keep-origin.http.html": [
-   "083c2d92917e50829c171eae37fbed541d6cadd7",
+   "c5f69765ad3298f8bc11b7c33cf5fd9f56625ed6",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/same-http.no-redirect.http.html": [
-   "60d2e5417ea98ceed6e030e98857bd5b20a48d9e",
+   "3878702db2d3b48be42458b1d4b48dd6a6b9b9b2",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/same-http.swap-origin.http.html": [
-   "133c1109a41e1eb00ed6082830f5c40dbc90b06d",
+   "802d3d8aa01ba8396132eca0149ae29329606b3a",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/same-https.keep-origin.http.html": [
-   "888fa14be5e052eba13bc444905c94405faab13d",
+   "5c4627a5b40bfd1c194e9177293127b6358029e3",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/same-https.no-redirect.http.html": [
-   "be0b84957928ee34bece9d403925f726e95d30b0",
+   "1437d293002ddfd7229aa9891e2d2ead373445e9",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/same-https.swap-origin.http.html": [
-   "14595f061dd350abde1857f6c5398adc36e84f31",
+   "d9e178af18b1fcff06a1826ca4f517c5b3ee47ed",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin/fetch/cross-http.keep-origin.http.html": [
-   "c11ceb3c466928e3ddee1192bbae1baa8bb3065d",
+   "667b67a5a702046142cf93cb722731431f6b7d41",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin/fetch/cross-http.no-redirect.http.html": [
-   "76f970a4d1bd57c360511a1b99f4c5c2223efdfd",
+   "600411800492528ec999b8856530bbc73e218b68",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin/fetch/cross-http.swap-origin.http.html": [
-   "d0ecd1bda69f1c327d010a8d38d9fa062691b8e6",
+   "c9908801142c1cd2e41ea28458196503a1461b40",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin/fetch/cross-https.keep-origin.http.html": [
-   "47d2257a14e066e63d6ccfaec995d51b0003a337",
+   "b7bb0e27d785e65189dac0cb2442c25104d39b1d",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin/fetch/cross-https.no-redirect.http.html": [
-   "3830dd1e6bc97516e561459523eca1f357395842",
+   "024ce73fffd58c58b7adfcbe88d5067d8af15b58",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin/fetch/cross-https.swap-origin.http.html": [
-   "6884a499b9d07369e6fc124988e7f61d3c31c57e",
+   "92244ee1e266aa260dee247f9f252ee5dc643006",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin/fetch/same-http.keep-origin.http.html": [
-   "c3060ee9df4a370a8a5c86a6a17214d75ef21470",
+   "e004df39262a5ff4ab9e120ab5b40e35ae773bd5",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin/fetch/same-http.no-redirect.http.html": [
-   "a1f0f836f2c9dc95189a3052f424a4808bb92d7a",
+   "0796d9bd8e757ec5af27a5a194c6d01631ade31d",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin/fetch/same-http.swap-origin.http.html": [
-   "80dd7c3ed5fecadb2c27cfb66ceaeea1676a361a",
+   "19523f159df099c6c87ce0a93d440600556203b6",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin/fetch/same-https.keep-origin.http.html": [
-   "730e70e2dd43a1c778e5d97ffca45006df10870f",
+   "87376d86665163cb0a8c9ddf23a6956094bfe509",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin/fetch/same-https.no-redirect.http.html": [
-   "0b8c67449a71539a4df8c3c108c22c70283999a7",
+   "eee2bc0f23d9ba48b2eb8a4d2537a463d30447ce",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin/fetch/same-https.swap-origin.http.html": [
-   "545ee9085e68744f4b5516dfa9c469ae34442d3e",
+   "dd846613a7cf5c4dcb3109566ec4902fb4b5fbe6",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin/worker-classic/same-http.keep-origin.http.html": [
-   "98759fedf7ade7127e4b9919753d4aae9d827031",
+   "b483ea505295ef02dec37d107da71ba7b63b50f5",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin/worker-classic/same-http.no-redirect.http.html": [
-   "98c0bf6f85c572e6f7348a3ca2cf24ee3f6c1a3d",
+   "740c4ef140da218806623e1a9f2106e531595a6c",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin/worker-module/same-http.keep-origin.http.html": [
-   "295cc9765f3fd79d0d793aa3394b9dce7d7039d3",
+   "950aee01cc517d228039a4a5bb63b60fdfae3718",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin/worker-module/same-http.no-redirect.http.html": [
-   "a811f6bce99752da07382e813bea017bcad9b4f5",
+   "123a021cd1042370366ab5968219bf640e943000",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin/xhr/cross-http.keep-origin.http.html": [
-   "2cd5a5d742dabede3527599c647a578278f5453c",
+   "a9c1b279686451bccb1806f3694de9db16a529eb",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin/xhr/cross-http.no-redirect.http.html": [
-   "7e1f552b897a4dd765a68113067a348a59496cfc",
+   "a76d154cf48b52d931dc9ab4e11b23824dd1efc9",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin/xhr/cross-http.swap-origin.http.html": [
-   "be2cb91141b49bc91268f3ce524cbb15e6567023",
+   "27ac462e6a11258d0fbee9391787b6406cada7de",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin/xhr/cross-https.keep-origin.http.html": [
-   "01b3d8135e7f99d71faa9cc053c002040c8db719",
+   "61c12bd615fc2f362d6a60292098e0b4a505cb1b",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin/xhr/cross-https.no-redirect.http.html": [
-   "a3b408f16950a74fbd46472dc2bdc1fa0306daee",
+   "1b42718b941f369b7e2c541ce08e19868f08d4a0",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin/xhr/cross-https.swap-origin.http.html": [
-   "e3f5f93bf72b0380abf3b20198e28a653c8a02f6",
+   "e1a13c0cef822e1b7ddfa742459a03b25a6d6b57",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin/xhr/same-http.keep-origin.http.html": [
-   "8301674414f5bfb0df584f49c361f4bfb69c1c9d",
+   "04778e6a7f9370c01b5ec6ef41e0a676cac43788",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin/xhr/same-http.no-redirect.http.html": [
-   "8933c42a45c8a8039217c2e264bafe389e2fd95c",
+   "750c51d97a28568e7323ce91f3ce8fdc94ad589b",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin/xhr/same-http.swap-origin.http.html": [
-   "125cbd6e68a6f4b2bacdbdfb93b13fccc9c57540",
+   "65b1102ed48a74fec84576501ec25a9b7acb28c8",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin/xhr/same-https.keep-origin.http.html": [
-   "5a37ef3febec9c6b655335ab19ed739e1f1bcab3",
+   "b4a0c09da3095f88b8a2c2c4c121c98f9ea68b9d",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin/xhr/same-https.no-redirect.http.html": [
-   "4eae1c35458b06f562d62c24b778605e66aca376",
+   "ebaf92063c341878b58e1095bcd3d9b84ff0c989",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/origin/xhr/same-https.swap-origin.http.html": [
-   "6fdeef3dfc951568c4a44ed1b0c331ec9c0764df",
+   "6083f2e6ad22673fbde93e01e932989e196dadd9",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/cross-http.keep-origin.http.html": [
-   "f84e7957dae9be5bd0745565b9463885e933be2f",
+   "5710f5059280533852203c444c97417b672e7c8f",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/cross-http.no-redirect.http.html": [
-   "2550130700f8c58e6629b7794dfb2ab9018f3961",
+   "8d77253a55d4256966526bb0097c49c1d5c679ca",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/cross-http.swap-origin.http.html": [
-   "263451885ef5b8f117b3d6945ab917597da3add3",
+   "ae40668002aa83b2ce3d9ed63f5c74575089eeff",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/cross-https.keep-origin.http.html": [
-   "b37d1750b28dcf4f6e79d7464dfcc3f6485c2590",
+   "1da453cad3667d280625f57ff00cce7377eb0b47",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/cross-https.no-redirect.http.html": [
-   "854ec2f54e392c6d378290c52b87f4125e8dd72f",
+   "7910f640c84ac76da9b91d8da22743618da9385e",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/cross-https.swap-origin.http.html": [
-   "64d4f2031b36511f7fa9d24abea1a0696df3c7e1",
+   "ef71ae20e8bd8b023513546b55d548806b0d6586",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/same-http.keep-origin.http.html": [
-   "88963b3c21ab1b087fe1e5752437eb70850013b6",
+   "4421d9693a8d237c9a4a58a894b4caf470488f90",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/same-http.no-redirect.http.html": [
-   "ae987334497ec6e10f8fbb55a34f1b3950c6ebba",
+   "ed5b109dd2d9ebc1bc4b1205c7d6b2b519307216",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/same-http.swap-origin.http.html": [
-   "e95dd4ae449dde916d9aa45c3891ebe08e51cf0d",
+   "5c76401879d8da97517b1a30e6c2a93500894d40",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/same-https.swap-origin.http.html": [
-   "641e702f0ad6e955a785b447b1359563e27a0e59",
+   "4006d3a3b43887e37210e1eeee61f5a9d6fbece8",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/same-origin/worker-classic/same-http.keep-origin.http.html": [
-   "b6b9fb52e893ff548dc6aecee061b52c1efb6708",
+   "f47f7232e03f35b0a6567e7a75812fdf36e35ff3",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/same-origin/worker-classic/same-http.no-redirect.http.html": [
-   "a1f8ac2730619e5503a8090505c2e0f6842b4c6b",
+   "8de6127a6782d1a31698f8b49fd39e049e17d4da",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/same-origin/worker-module/same-http.keep-origin.http.html": [
-   "f6ce3e0c92920879a6206aec285525174deafe96",
+   "c5755b196142c8726a23a61397a1087d5fe81b74",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/same-origin/worker-module/same-http.no-redirect.http.html": [
-   "5d13e002539b1e3d75dd81bb3d2be56645017335",
+   "a296ee2917bb376d734f2efe751fe76c539ab79c",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/cross-http.keep-origin.http.html": [
-   "3ad437db868edd9a546e541955f4530f72846569",
+   "49cc1a4898c8a19ce36777fe8f42b4605cb355b0",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/cross-http.no-redirect.http.html": [
-   "33fcf8468643d4e52031dab87c2cf9c804e4b3a0",
+   "9c7d7eb7a1ee9cd93d478ecf2ebb51dea199de7f",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/cross-http.swap-origin.http.html": [
-   "7676486094e5f9381fc24713eae119d32d6f7660",
+   "c466fe5beafb866caf2b2b2a8dfbffeb8b64bb08",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/cross-https.keep-origin.http.html": [
-   "a81daf7ce19252ee8f586933466b912f5ae3013b",
+   "6247edbabfdcdaaa48e4fb16130edcb217f47116",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/cross-https.no-redirect.http.html": [
-   "962b71316e34b28c070cd23a078fe36daf3cbdc5",
+   "dd88f712a150af0b98819001a42400a7d1d429eb",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/cross-https.swap-origin.http.html": [
-   "363cbaa93d8e0d86f74b96ff30d265fabd6f00e9",
+   "0c4395a1e7be992c350b2297cf5385e2c0b0032f",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/same-http.keep-origin.http.html": [
-   "7c147f23eb62bc5fd6397cc9a25d659b292e0661",
+   "2d602531c83c9a2631236ac21c345522501aa8d0",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/same-http.no-redirect.http.html": [
-   "d37f669f217de5609a26d9a03ecf63b22fb8afeb",
+   "f91fcc2a5c712a3365cafe842277c0490e43cca5",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/same-http.swap-origin.http.html": [
-   "ec2fdbd14d85ae7788f32e1456d204a3c6f45b51",
+   "40b8decd33d67e09b3b4cfa0920b8c2792096573",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/same-https.swap-origin.http.html": [
-   "a5cdb2c70fa17c77deb3618796bdb86e16f41436",
+   "85be91bd8c40e33f8f331059b998c66997a79249",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html": [
-   "765ede62e3d2667723c83970ba5e6d40f2ce9099",
+   "04f379f21e59b6ef0c9494eae1df1a8e852f84dc",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html": [
-   "684646f78315512195b58732760dcaf9eea411aa",
+   "7768727f457c7c0b27512d5cba8420801ba6c371",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html": [
-   "eb5d6982d7f4fe9712fe9d30af3f49e6e56dca8f",
+   "b26c6cf6b5ecbdfab5b1a80dc521308f4f087fd5",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html": [
-   "b85e61b03123978af839c12e49db5dabb2787bd0",
+   "0ae84da8e71f5517b33c4be80c7bdaf92123506b",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html": [
-   "41dc53d3a554ef518a27448524cfab9855dc558b",
+   "c4d8f9f9f75499c6696c1e37859a27daa9bda3ef",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html": [
-   "939ec199400b65dc794a43763471138747bfa391",
+   "16396ba1c4c434f47d43772fcf8198dd240db5d7",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html": [
-   "dde5deb9c43afa8e2c514fd78c4d7d7c2a39f64c",
+   "1f652ed96e5ac7d6d4bad00a1da8a97ef07c2aff",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html": [
-   "c0de913d9c73f8a26c9415bbe901b0a9c8369b2a",
+   "7ea765e772bb3ad5fe1b0c2ce01ec4be405f8726",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html": [
-   "ec17260f0ee26a2e2b3d0a22376cf27b26967bff",
+   "0c67b6c5f5066a059588e59431b777f0ccf15655",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html": [
-   "7c659e7711bf0ae1176179fb900c6fd1f2a9f724",
+   "adfc4ffb8ec95a691720d1a55ac0dd340020e611",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html": [
-   "9171ad57bfe2a9c3ac85aa88faa6534383d4b239",
+   "4a599c231ae2a7a47e071f0b58ff94ff4e67408d",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html": [
-   "5d1da1b64de1c735fe9ef19b978c090008e78158",
+   "09857811f5450c6b74c4f06b6b64cab70d2d9370",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html": [
-   "0992af88c524005b749946403fc8e34809727561",
+   "7684917966ce80babf3a05c8367076bfba55a438",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html": [
-   "2b267e474ed0c4f294a2d0cba4a5a27b0a5fb60b",
+   "3af26b1bec28212353395f2c787d0819809fbedf",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html": [
-   "5ce50b1a9050f1a94165f6347bf8535579b9b9a2",
+   "ffb9e111456a84f336994724a83c8632585d7c52",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html": [
-   "979cfcd9f95fd1461d7b2eea4aa8153cfa5b2987",
+   "2a84f11c652a56b1555cd59add90f36cc5ae473f",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html": [
-   "4a59fb339ed02c1114eeffe4dcdde701376610bc",
+   "3c2c9f9a026376e2b54f18af62faa7156fe39ca7",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html": [
-   "45d520f5580887ba2388b49796ff9a8f4423c6bc",
+   "191391ab31162d16cd83d070815a97eee5b5f551",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html": [
-   "8f155d3c1426f18fd92d1ebfe95f08d243a42587",
+   "027f55ea0c114ff2a62191a16841d50b90f159c4",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html": [
-   "c4a36aa3a9a4c2b200fb767a6e70bfeea0c02604",
+   "5933a804c63a130344951d4589c0effa2655044f",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html": [
-   "458079006c0c8f6ddb9b9de7f174258563d481d5",
+   "9cab9b588ca70146e64686a30ed754691eb1943c",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html": [
-   "99742ad3815c5ebcc1888de5e68b4cfe60436eb8",
+   "638a75ae1cf4d3bf6332028e3c3d5480eaaf3c65",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html": [
-   "d98173893ea1d56298d6fe6162432905078c096b",
+   "2d3fd299398e7f683daf5ec358c6be0a4163faec",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html": [
-   "be8076df6bc5484df5c5d55b4ad0257b78d43d05",
+   "e5c97576ff53cd6ad2e5a8d94cec4177ac931129",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html": [
-   "55063e335f0e9185c998769d92111338e4640b6f",
+   "3d7ce707212aa14a1f99b619b932c0ea9f1f402f",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html": [
-   "a164d3ca9fb18d523aea155b7eb271b0567ec041",
+   "1e56cc4e1bb1a0233789b282c5b4090ea18d0ee7",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html": [
-   "e9383d0a5a43af3d766991927cac1a527e6e869b",
+   "c057078c8d13779373cc2c86b81c0ea21b81ea6f",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html": [
-   "3b3459d2b4480fdfb864b87432307a28a0186c3e",
+   "738db2d64d7d1c8ab407ab69a3d5472a9353c3f7",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/cross-http.keep-origin.http.html": [
-   "c791d7c6c90ae60adb4c9c53a6cc523bb07e942d",
+   "3c4fb90d43e6f2653a016f4b5834e1def7da044c",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/cross-http.no-redirect.http.html": [
-   "948e77c23236f9fa85e1a21aeab01e0486d73db3",
+   "c5de37784a2e87d9fff026942028000535a0181d",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/cross-http.swap-origin.http.html": [
-   "dfc46bb9a02fcd58fab39dd2dced42e1d9e7d084",
+   "65c20b010f892c36cd428fdf3664e421aeeeffc3",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/cross-https.keep-origin.http.html": [
-   "45e35de3e6dcae3e4e7bfd0b7958f2ffb2e79889",
+   "c073bf16f041d3bd22ff7fc5375317f7ec8803ee",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/cross-https.no-redirect.http.html": [
-   "959c1185ed0ef89d1fc4b96f53ba9fc788f3c360",
+   "98c60e9279a0716e86e9679eb728a58a1a2d7a29",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/cross-https.swap-origin.http.html": [
-   "943d9e9300de1cf3898f65321385342147608a9c",
+   "fbf79f0c0d038d5f924709f166d323a7edc5eb0a",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/same-http.keep-origin.http.html": [
-   "7a07ea6f0cfbf6e10bb6839ab61a965aff693bea",
+   "18d4d666c435e2864175fc9fbb0dd97452b23a59",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/same-http.no-redirect.http.html": [
-   "441378d3d9e9cbd726578eaa8668c6804d539217",
+   "80ce51658e28a97fa3941b3545fc9bf916a01cd7",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/same-http.swap-origin.http.html": [
-   "e370555b9c4a7a91e2bff7eedd168dd25689920f",
+   "f594282df2a42c170c0a23aee7a8259b0b08b901",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/same-https.keep-origin.http.html": [
-   "529f51178a356f93a3e1a94c500f9fe39890b8bd",
+   "ce992d7e1c100258f98e299fdae558d78b5444af",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/same-https.no-redirect.http.html": [
-   "1f0a94076e662c91a0c5843e1d8956dc528ba449",
+   "884a0983e771be057ed72563418a5513d3edfddd",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/same-https.swap-origin.http.html": [
-   "8a0b1e2d03e62d9cd2692da9aa2f09c8d37fb7da",
+   "f433eaeeaa672a934c9529b9d16080f4f9554af6",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin/worker-classic/same-http.keep-origin.http.html": [
-   "a34370ba1089983ac0134c69d6af8fada5139e37",
+   "508ee25c82477a26015da7f2a0bb5c2c62c28e85",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin/worker-classic/same-http.no-redirect.http.html": [
-   "9433fd397d20c78ccf8b47d268a120a4ce8182e2",
+   "f67f753460a304f634599f461984d52fddecc052",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin/worker-module/same-http.keep-origin.http.html": [
-   "20fd1ce5099d50afa336232d9d6678e100cbb8bd",
+   "fd6190ee51389de60cd336f92b51199933835137",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin/worker-module/same-http.no-redirect.http.html": [
-   "e1bb290283fe4e25403f85f2d749bfa51876574c",
+   "cb6a39097b0a7ad23532aa4c123bccde2012b7bb",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/cross-http.keep-origin.http.html": [
-   "4ad132b120bcd2ae8d045e68ee873aedcc7966e2",
+   "688ebe2503bca860485126873638ee6e232ab4d1",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/cross-http.no-redirect.http.html": [
-   "d86f49f637c2d479ffaf059af5ba8d395d41bfb7",
+   "9a07afdd3bce80c02589943574dd1ccb80937ca4",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/cross-http.swap-origin.http.html": [
-   "a341a0d62618425b731f1b301105950fc0f11b65",
+   "283eec4941b4f10344d802807f9f3e5166e0c31e",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/cross-https.keep-origin.http.html": [
-   "a78699124ed38c90a060c3b10de5165f1c834bf8",
+   "5eac4de84f244c034fda74fa61c658bff057767e",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/cross-https.no-redirect.http.html": [
-   "28c92ff3e639d67feccee703b3aa0360e0aa76ff",
+   "ef0a65d1cd678f05a8bd3122b0a698cf7d753449",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/cross-https.swap-origin.http.html": [
-   "62df9999b4031765f615332115ff7a3c66f1ad31",
+   "9d78e4434f7d6a01cfb13b504b0bf32ef6c796a1",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/same-http.keep-origin.http.html": [
-   "bc93d873258f49d2abbb8d85adaaeaf195639e5e",
+   "721e69e65777760b69c43546bd5334a6ab7cb8f0",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/same-http.no-redirect.http.html": [
-   "ef8eca364654dc6dc8c43d6a39fa9ed92c5ae4e7",
+   "cd0a701c5ef8c444dcfa119ec4c22b5984bfaf1e",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/same-http.swap-origin.http.html": [
-   "94dbe390156e23ca46a6a8bc64113d2823d95207",
+   "44afa347ad17dad05d026ed5a25dcc28dffedfd3",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/same-https.keep-origin.http.html": [
-   "b6347dee39f0c27f89b65368d709eb7786194870",
+   "0dbe4788c4f399d2b3f35ac72bfbb3ad5ca7e56c",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/same-https.no-redirect.http.html": [
-   "69c9db4e2c63da2b822949c57d80d0dd11b344fd",
+   "38907838076f8fcf6f2faf585d999fec4e9bba3b",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/same-https.swap-origin.http.html": [
-   "b4ea52d9e6b7d5fc66c53cb500f4e2292841500c",
+   "3490ec97737ad0493e5c3bff975897caa3f4d88d",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/cross-http.keep-origin.http.html": [
-   "89ec238f6e8f843edeccd270c13da4e9d597d893",
+   "44ebb43e8054a7539b8046a1115975d6f1b95467",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/cross-http.no-redirect.http.html": [
-   "487db06f7e11490d106a4d1cd5ab68a3018b1270",
+   "c1da7df08f2fc1904c2f8871a04d31228e0d91b1",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/cross-http.swap-origin.http.html": [
-   "52febb51feef0dcd3f65b0ebbcc6ecdbcb5861da",
+   "f68347b96002b628b0066f9f04c07e25b223b441",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/cross-https.keep-origin.http.html": [
-   "1a3320543249424d432710b62a57832ce9cfe6e5",
+   "a996d9b6db10a3dcbaddd74a8bcfa02bf52509a2",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/cross-https.no-redirect.http.html": [
-   "9cda36a3a36cf5f59d710caf8de557ad9a88cac8",
+   "e8c55b6da9055f966f915caf0714f10ba2fb87ee",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/cross-https.swap-origin.http.html": [
-   "c0686a0dd6677ad1e38908d9b00fa1170f385f35",
+   "1bae6566373ca8568c516bb81b8787fff5393872",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/same-http.keep-origin.http.html": [
-   "001f13c4a595e7be83561f5cfd5b2c36fd3df0de",
+   "e5cf65ef6715d9bb1319285af2dbb4ac50213365",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/same-http.no-redirect.http.html": [
-   "3e87e65f4ec679b193b5c9e13ff2a5a9e57c844d",
+   "9a7972139145d61d4ed166c42385fe7b87a476be",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/same-http.swap-origin.http.html": [
-   "9c00a33dc37f72114eacce4c4c54ef4d39e6dc36",
+   "46d7ebfbe649afc88bd18fabf7a88c6a9433ef96",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/same-https.keep-origin.http.html": [
-   "e61756c1143c1f4032638971107f32559b95bdd3",
+   "6ec2a508d8c1e438bc54bfd5e31a1caa957ddf34",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/same-https.no-redirect.http.html": [
-   "5d66b221d5b7c0eef81f2cba5231cc36aadc4273",
+   "b672a1ef975f20b9c5db629ebdd4435c13b94e2e",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/same-https.swap-origin.http.html": [
-   "1d3323cfcdac8f39cdb5ad0fbad8e0f4c2e6e8e1",
+   "8f87bd9a9cb7becff7b602c4e3bf8633cd50d197",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-classic/same-http.keep-origin.http.html": [
-   "239933545865e3e979f379301f96e0628b743177",
+   "4545495108202bd834d64b20161d36d4ec0805ac",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-classic/same-http.no-redirect.http.html": [
-   "24487e579901c17f2bb7304b1a2d2d0faae5dced",
+   "765bf8cd028c586866460e73c151cdbd68b919e6",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-module/same-http.keep-origin.http.html": [
-   "73f210cf6b6b65cb8b0bb3a41f4f0408b0078752",
+   "de8e1c944af7c7d95aafa915d662dec637173633",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-module/same-http.no-redirect.http.html": [
-   "3515661e1dd17772fd184d7acea8f9de5f2dcf5f",
+   "c518301102964d28fc8257014b705eeb518f1227",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/cross-http.keep-origin.http.html": [
-   "8752e769bb5f3eeeeac9df4e8397158cd4014710",
+   "ffd46b81a46d01b455832722ca9a60026af21a4c",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/cross-http.no-redirect.http.html": [
-   "c9f944a4d670a422e58ffaacb533541e64211fb5",
+   "6b8bff53e847cfb3988ec31d673975ea55f17682",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/cross-http.swap-origin.http.html": [
-   "63a65114fcaea638b7f3dd62d113a3b4fd86a601",
+   "43c5ea6227ea2eb3d5a34b39de08859cec7d8695",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/cross-https.keep-origin.http.html": [
-   "2525bc4edf0fd031bed03a863ec3f1ab47ba3890",
+   "5e349917a702f1a0db8348a38097753f6e3296da",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/cross-https.no-redirect.http.html": [
-   "0ba222a713bb3c5d9115332969bdef18fa939ddc",
+   "2eaa6b0b30b9e9483e782d22bc18c8bb8b929cc1",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/cross-https.swap-origin.http.html": [
-   "d3ab30b3f8fb8ceab1ecb718eb0eb808c317dd22",
+   "d3e0009d56316de652e990701ec236ae9c12997b",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/same-http.keep-origin.http.html": [
-   "ac870d795a39780a538ac40de927463bf65cfaee",
+   "62d3310f44cf4f6a87d14c2adb88f1c36800bc80",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/same-http.no-redirect.http.html": [
-   "a054d11232afbe58de9b65528ca63f2d8374fa93",
+   "afa85368ea18bc76117223348b4ee282b9a6d287",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/same-http.swap-origin.http.html": [
-   "83ed6ea49b94af35c15d8d3cbc725cc003327cc0",
+   "20b64aae72cb1c5b0d124badcc9900482fe2abf7",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/same-https.keep-origin.http.html": [
-   "abba4003a33cfbf8e9fad5ee0685253f9c64a9d8",
+   "38ee3daf519d4ac385c455d6c9fef6581d75c152",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/same-https.no-redirect.http.html": [
-   "c93f5faf837db0b8d46c00788d046d2a98ccb3e2",
+   "7073cc96193055d2482f5953cce05a2b30d42721",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/same-https.swap-origin.http.html": [
-   "e5ddfe102ed497321e290d6805f6991953f81211",
+   "3b9234a25ed7ba9e660a396e208c3a8770a1202e",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unset/fetch/cross-http.keep-origin.http.html": [
-   "f87c439209d71a0fabef91979d0545c9c0445c78",
+   "96c42a63c8968c1bf3215109f16bc1437bc15721",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unset/fetch/cross-http.no-redirect.http.html": [
-   "2e25529f33745517c2b209389401a4535a0e5c3d",
+   "57056d69c145b06ad470fe21e27295535c41e3e6",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unset/fetch/cross-http.swap-origin.http.html": [
-   "aa74648e670fb20b79fdd902595112010c05bc81",
+   "f71edf30584e6c8b2dd405bd052edd5013fec742",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unset/fetch/cross-https.keep-origin.http.html": [
-   "a8a0968a59804d42d889166d7c5d7538d5b0ab79",
+   "89c3cfa17cf150ca100072d142ff3ece6dacb9e5",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unset/fetch/cross-https.no-redirect.http.html": [
-   "78e5de90addd8b276398ac7969dcaee3c2ad7d42",
+   "b076b2164a7a81ed0db46123c45a68390403eb4f",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unset/fetch/cross-https.swap-origin.http.html": [
-   "e3cb0f03e0fdb6bb267952ab2261732697302c60",
+   "9740934bc5fa4c25bca46a67a700ad5e8fd86920",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unset/fetch/same-http.keep-origin.http.html": [
-   "8c615d24d427852ae72f79ae8beb33752addf748",
+   "04d5dfb8caa0e87d0364511da875f49ddb278538",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unset/fetch/same-http.no-redirect.http.html": [
-   "5ef349eb5d441eb56f7711464b5c155c1d802f60",
+   "edbf6e6a9ac3ec66a39df099835a0b1270406dc5",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unset/fetch/same-http.swap-origin.http.html": [
-   "84e6b53cd2fd29f465e7423b4070ddf3b162823b",
+   "c84127d8cfff6d0f7d82f2c8cb99072cc92cdf2f",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unset/fetch/same-https.keep-origin.http.html": [
-   "9721da9c58c274b48672ec8c7ef74d9e4f7040c2",
+   "8ecf867adf340b396a1d6950ca40e207a84fc003",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unset/fetch/same-https.no-redirect.http.html": [
-   "99ea34500ef9bed25cdd4a3cce37be620ecff7f9",
+   "c0e540c629370cb85537de799d1aeeef481025b5",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unset/fetch/same-https.swap-origin.http.html": [
-   "81fb2f573cbf504870a9ca8b546e0d1a83bb280a",
+   "f6177e7f8b29c6e96e3336694855d87da1059bfd",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unset/worker-classic/same-http.keep-origin.http.html": [
-   "ace5fcb03a3b94f5f26f5e71cda62b7d6d260eff",
+   "07bb67b7db533b917081ee87b50cf3be378acd24",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unset/worker-classic/same-http.no-redirect.http.html": [
-   "f6ad26085ef980befa89157923a06dc18ca8449c",
+   "48e9208a3468342bfd7a7da73ca532c8ca46a8a7",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unset/worker-module/same-http.keep-origin.http.html": [
-   "7dff9a4a1cf4d4b9daa5d0ae80e3d5ab028e3472",
+   "3ca8ef7b4b8cd3517b7ccacf970e2dac92daf74f",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unset/worker-module/same-http.no-redirect.http.html": [
-   "d2f60a9aed3d08436020adabc61a956e562e1c36",
+   "05c951240084f374cddad23f0a792cda47e4f3bb",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unset/xhr/cross-http.keep-origin.http.html": [
-   "46ced07040fc5a4432501e3f89330daa08fc0605",
+   "f20c066df28788f513459e85f6b3711505554ebc",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unset/xhr/cross-http.no-redirect.http.html": [
-   "e1b9e68f4355c0391842184cfc756a4a239ebc84",
+   "1a8f13ea9f76dd331acf7d9af7cfcd0c11c24b9a",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unset/xhr/cross-http.swap-origin.http.html": [
-   "7da4e2c3f886c5a1eff99b2653de1c9f692ea466",
+   "acb564d16e8ff101bc96f614b8ee7a69ad7a213d",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unset/xhr/cross-https.keep-origin.http.html": [
-   "80c598e29d98646a3783c48e309210226fc02046",
+   "18d15bcf0698cbccacc93bd4abb2c0210451b68e",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unset/xhr/cross-https.no-redirect.http.html": [
-   "595132c6aa712cb78a05e8fa4418ba5f08db7dfd",
+   "0b5adda3d8161ce9c057ad99c78cbe2ede3074b8",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unset/xhr/cross-https.swap-origin.http.html": [
-   "37f034b327b9075959c4ea1fc012650eb5b20e03",
+   "b1d04d2b49e719acea8bfe984c95a729444177cd",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unset/xhr/same-http.keep-origin.http.html": [
-   "19d4ef2430e1716fdcb83fa95a2d9e0447a4df55",
+   "8ecd583ae9474896ba95cabba1999a7aba46ce81",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unset/xhr/same-http.no-redirect.http.html": [
-   "98c4f7a1eb4c2182dc64b740df647b538102520f",
+   "dd428f734ecfe9d6caac497302a519d3adedeedd",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unset/xhr/same-http.swap-origin.http.html": [
-   "00d79fe858102bbfdb6fc9f11aa3468f318eb586",
+   "c34a62747b2f85ee450cb80e85fdbd1216248175",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unset/xhr/same-https.keep-origin.http.html": [
-   "7d7d06d83e47d659c33b4df197c8f50626ba66c0",
+   "99db6c438ae1a27cca42358207f185b46559da17",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unset/xhr/same-https.no-redirect.http.html": [
-   "7c71974147ede2c621f26aaca595a06490d5f0c8",
+   "922174090b7c0b0b1a41d3931587a54e19344aab",
    "testharness"
   ],
   "referrer-policy/gen/worker-classic.http-rp/unset/xhr/same-https.swap-origin.http.html": [
-   "6cf8f047e1532cae416c5cfe2743ebccacef194d",
+   "fcd2af596b046f34fbf63cbcc612cb406be2d48c",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html": [
-   "818733c32969ce31d6bc79a5913c4a0bbdb1f5d4",
+   "b3ea18b9fb6b58b0dac38795df3f6fe61ae537d4",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html": [
-   "3dc64f40e063326e2de896e256f1c4fbe7d32ed8",
+   "7f6edc91be64c10e7c3c460c0525466b4b9fe8a0",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html": [
-   "663d39d31f203f25968d2b2e48bf9eddb19b6ce4",
+   "61b7268f9b3868b1daa6c8a1d844448c228fe2f6",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html": [
-   "edcb9c2dae36bbd9211ebb01c448ce4ae920ac80",
+   "072d94f9e34dec56a0014993145b6259af7e97a3",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html": [
-   "788f96c8790096f5c583ea5e764aa1ba34dc9398",
+   "d8eceb33df51132a4775db88c447e72ebb1673c7",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html": [
-   "46ad1a34c081a34cfe693e0b521b444539f647c0",
+   "b329b3351a2a7ea7099610ea76927d32d3b8b89b",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html": [
-   "520b9fc73e97c86cdff5283ff38e43b6a56452f5",
+   "fa23f721ae230ecb0d86fa5a4d5e97670591ae1e",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html": [
-   "735926ab71e2b8aec6142974de92389379270f2d",
+   "30a0b8679b0311d86098d5fa5b553e4188348b72",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html": [
-   "26f2ba7d581e07d64c70df4878799de09cf3a435",
+   "aa407ccbe448245efdd29d921a8fd698005fd832",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html": [
-   "8f814bad57f6be1df11987a717b3d4245f4c002c",
+   "7710fd83c17ead83e37644c71694b9c9c7925c23",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html": [
-   "cbd9e020b6dbebdc1c44f65aba7e4e277ba32abc",
+   "f1d54a402bf8794ac8873b05ff4ce5dc8ec38a79",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html": [
-   "a411ffc400ce9fc23031ccd69f0c94327936692e",
+   "0dc6271f34a8c6122725b29db7faa1c97ffd8705",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html": [
-   "a064bad0e50d4f78bf961633c404633d88ca242b",
+   "2a87dc17257659ae7913e46d613f761f0819d173",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html": [
-   "cdbd2b055bd06b61efc3b23f7de79672f8b477da",
+   "292fdd1e8d1f7ec3f5a21f5b946809b75bbbe232",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html": [
-   "a7b653e2c76518535b49e0a5382d4edc3dceaecd",
+   "ab959688664a77ecfc20d9e3a83d85e07deee006",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html": [
-   "540059440bc8e0c8f3b9904c761d0dc137fea008",
+   "a5cba23dc8002d20d99130f457c994c5d0a33d9d",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html": [
-   "ffa896147d793bad4702a8d20d4aee077656b318",
+   "add8b647fa07fd5543919782382fe3e658a52e68",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html": [
-   "c18106c02f23db2b3bbb8f66ba750a2ae8fd687e",
+   "400756b999e9296f157fbd9f8ae20ca48de746dc",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html": [
-   "d9b5ea9468fd41c2b70f0560bf9c119aa66476dc",
+   "42e16819495eef1a1291ce5016e9a195b2fc6364",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html": [
-   "c6fd0f10a5d1240db209a79946f3c93597e5aa55",
+   "e9a77ebe70c02d7ffb476b2cb108f5e7eb1cfbe7",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html": [
-   "66f8ea95d8ca8382f6f96b01c73dd8f182048d71",
+   "3e3810e1f7362a9879b455e5dcc2a3b075b25154",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html": [
-   "c6e23f8507a48a16d3f880a7bbbab7708e234f33",
+   "423b23862fdde920dfcd677f1388e26059d92939",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html": [
-   "b6822c58e0dc1facc8c25a950915a3a64b7fdbf9",
+   "17433da6149a789666afb18dc098d1a31194baec",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html": [
-   "6ee9252103a61f28cb539622582ba226c1e8afce",
+   "9cec405a2ae83850417484d7777a8d927bfdd46e",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html": [
-   "ea57e8e319db42fe13018ee76fdeb96eafe85fe2",
+   "04d58fa287cf76998dca3849510e74e781802246",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html": [
-   "edf7ef0c4797e06674dbc0e26e3b59e667754981",
+   "a3435a931317dbe444eff370aa8de237a6ccc641",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html": [
-   "51c6ebbe347d20a4c132aef05eaaf126e038334a",
+   "ec006ea8fe3c957c582b5cee0193f107b9e5f4ed",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html": [
-   "c75fa94e278b4c9c5e4c8b5336cc4a96d965b3bd",
+   "d9ba51a757c7d878dea95e5a5ca546df89eed576",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/cross-http.keep-origin.http.html": [
-   "d6875a5e66dd63cf372647782079a1aee5107047",
+   "611f331b7357c846ed8005095cf8882e3540c7d0",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/cross-http.no-redirect.http.html": [
-   "a7a9256beaca4faa41a352250ba0c97ed3b60328",
+   "d04e5019da1d1244db7e348f973907bced0a6dcc",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/cross-http.swap-origin.http.html": [
-   "2d8ae3103680ca2150e5b8c58bf02e1fe13be9e3",
+   "193d0d7d9b5ce1ae5752432deda9d7e809d561b3",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/cross-https.keep-origin.http.html": [
-   "a62b8e83f7c6e4776f83725c8523e52039183b6c",
+   "517274e7857e34878e5a62913385adf9fcb842c7",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/cross-https.no-redirect.http.html": [
-   "6ba5d7586db49d018cb38f5bfea867aabe9e5751",
+   "89f91632266e633d782d477250cefb754f14aa63",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/cross-https.swap-origin.http.html": [
-   "54e03e817b3a0ad0938970aa40718a1d068666c0",
+   "15b057805a4978028efdd9907a0ae50d25154e78",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/same-http.keep-origin.http.html": [
-   "f72e8584686207ca46252414342432a6dd4a49d2",
+   "82910461dd7760ac484e017c9077f9732c80e7ac",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/same-http.no-redirect.http.html": [
-   "9c2722ba8cc2636113b0822db9a3623056c36282",
+   "67d5422be002a5d850ad9735f352d8cd01c81445",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/same-http.swap-origin.http.html": [
-   "88e6e5817d44bf2398e98db62a513ddaa121cced",
+   "d7e2dfba9f36fe04c6cc826094c5b0f8b0aaa533",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/same-https.keep-origin.http.html": [
-   "373d60b5c27b91c3b7d498142009ab21a56416d6",
+   "bf181457325aa6e6accbe11f1538e98069729f91",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/same-https.no-redirect.http.html": [
-   "3be6f3d7d54ef8e2af74c687ed5221908c519831",
+   "bf48e758e1c5c60bef27f0893a4de2d3e38775d2",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/same-https.swap-origin.http.html": [
-   "9963495e1fa3c32914470865c4b525b047c075be",
+   "e3ffc841db80465969b85767074d39384abde431",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer/worker-classic/same-http.keep-origin.http.html": [
-   "c0bbd9e80e1936e612d7e82c6f5a17c3b2a8fc10",
+   "d2edb3df4226891e7c1e19387ae83249b51e85cf",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer/worker-classic/same-http.no-redirect.http.html": [
-   "710d8c9d8316c67ef00ff60b0140462f88e0cd56",
+   "ce3870f2463f0efd0417df0ef6affc40366abcbe",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer/worker-module/same-http.keep-origin.http.html": [
-   "46a77fc0a0975b11e86137367da7d86d0581997b",
+   "23c0dfeb05ec40ffed8a3b4eef51525d2e9663e4",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer/worker-module/same-http.no-redirect.http.html": [
-   "f7a98d21c2270bd614927f8127ba67b273e430ec",
+   "c58ad5f2129b5437d14159c78d2d7f4cbaaf51f5",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/cross-http.keep-origin.http.html": [
-   "7b0b513fa4adca942e3610b3b335ec2be6453ed4",
+   "82f55e05aad661c9edac25884640893a3747a872",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/cross-http.no-redirect.http.html": [
-   "a4383529eb9617171123992e7ce83d6463cad759",
+   "d69ade0aafd1af766d58e49869fc434d02980e75",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/cross-http.swap-origin.http.html": [
-   "e51a3084032b64b644a3b6215d3a696ac0440380",
+   "b0de756296956f7e5d880bd1c474e62e13f600d7",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/cross-https.keep-origin.http.html": [
-   "ad2ce3f93e11f93ebd1f4af982a83b5aa7a79b41",
+   "7d650f0063fd371402236b4adfe5a60b0053bcf6",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/cross-https.no-redirect.http.html": [
-   "3885092582d960993eb086dec952d2d6749f353b",
+   "df7182c5d107d1a39a235c71f6bdb877db7d0890",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/cross-https.swap-origin.http.html": [
-   "48a868c082ec9fe432f08ff14c151f62013d46bf",
+   "cb374d68712728578eb0c14b2680f0c482ab1130",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/same-http.keep-origin.http.html": [
-   "2880de69536296a0b85b3b2d251e6c8dce86ec3d",
+   "f8404a257475b4cfff3695cab496a18f1debe87c",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/same-http.no-redirect.http.html": [
-   "03b819fb3d19b336a0bc925b6338d26c277ff4af",
+   "6dc3647c053cfcb0ee32049b80e14eadeb82bb81",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/same-http.swap-origin.http.html": [
-   "dd35c863635d20d6ed475fea388c7d62118ba53c",
+   "173c27e96dfe2bcc03b70df56c58f236ce857eb0",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/same-https.keep-origin.http.html": [
-   "0b67779386bfacd102cda8a971f62ed4c2cd15d2",
+   "4b3dd0fa3afdfc3a5ce824603bc117c04028cb67",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/same-https.no-redirect.http.html": [
-   "c52972debadc583f1533d8778f19d8cdd47bc4b2",
+   "1ce6da3d97ce523597643ee3b0485048e59c93b4",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/same-https.swap-origin.http.html": [
-   "5ea2c27cec545ec360ddd066e1f3088582e1c6b6",
+   "8cc3e20a88c1ade33acb8cf6290757e8b5bf2924",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html": [
-   "5156daea69aa54b5feba3a8b652513dc62868b39",
+   "ab119e2dc4655e517c57b4cc1e35a02485a8646f",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html": [
-   "f909452193408b4a60f33edb04c23b4697b078af",
+   "084097e726029ba5b412ae66842690a1c3927fc9",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html": [
-   "c99cb5b5bab6840b35404b1e399b0f2ab4d06754",
+   "b9b4829ac78eb2d1b2ee654949a3d673c27fd4fe",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html": [
-   "e063175993ba190da13a95eba4e735bc6f61d0c6",
+   "7aff19a116933c3ff6eb3aa438938aac6f9bc73f",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html": [
-   "32008cca880987d998a93d482a34af5deccc4573",
+   "86bc9d2ae053976fcef96043a1f3b11cf54b9258",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html": [
-   "668e35619e238f8bac6fe6da0e5cb19663780e48",
+   "2f0325f0377a6e16012ccd4cc08daa7a2b544cbb",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/same-http.keep-origin.http.html": [
-   "227b513743074608740817cc3b0e235c124543d8",
+   "7c01039414e408109ddeba9791d9ee2e9a9b8b59",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/same-http.no-redirect.http.html": [
-   "aad87e7856548a54d9da6e78f5a847ebd25b4fcb",
+   "f1a8981a37c0e7ea60157d8bd4ac638235d4acab",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/same-http.swap-origin.http.html": [
-   "520522a066c2931e07effc0d202dd0451fd39948",
+   "058f6cc6ca036f506270e01d2bd87525e74556c3",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/same-https.keep-origin.http.html": [
-   "8e1c6e61d4cf3ccd3d77a9a66669ddf3c46ae6d6",
+   "8eac07f576e3b981a77334dc4cc1f8a633595ecb",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/same-https.no-redirect.http.html": [
-   "13ef33f29e232395b4a47a5b62188efbe79f27d3",
+   "ad64aaa90f9bd30b40666d0496be6fcafa21b35d",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/same-https.swap-origin.http.html": [
-   "5234b75b68c08e23fe5a7ce54f866d371809faf0",
+   "0e7e7a8942bad19d49a5a1d049f7fb36bf700d1c",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html": [
-   "53895882f62b9ba0469ebc1d824063c764fc80d2",
+   "be0090489172006897875bfed70774511cef52e9",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html": [
-   "2a7fde0f23e7a53f16c3834a8747a9e11377a688",
+   "42837199b749113ca1845ebdd5c82e97112b608f",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html": [
-   "ad13fbe59fa70d5536af1811b380d0a85a77fab7",
+   "acddfc44bd28c3596bbc8321b065a8f998540605",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html": [
-   "c67005d2d44caf567fc5968fbc519ae67eba74e7",
+   "192ea4758816ac8015c1bf7f6de88e4b4b643494",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html": [
-   "c85d240a123cbdafcc2499219f9789a9bfe660b4",
+   "cedfee0933beed058d9037d74a9fc08d3f707679",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html": [
-   "5c09631e9a969366c86dbdae0c7d827cbab9ea8f",
+   "81c14463c9a4c9a8a73f49bcaa49b14779cb995d",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html": [
-   "eedc489caf598ac36e5ede5e83d9223f3071e5dd",
+   "ae67981efe25511a08b52f221a5246bbf5812d20",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html": [
-   "5bb6cb6f07c24c9c801b4da2425474410d49370c",
+   "e5146301f3a57d3cb3438782470fd7832ba5ecda",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html": [
-   "bb391df01c4d4f909ce55d2482b706c492775d16",
+   "8b33dfc99959fe1b0127b586342651e1385fc997",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html": [
-   "6201cfc00daee0e04b05a3eba4e85322e1d2b628",
+   "75e60476ab884f61f40364553ea65f86ee1039cc",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/same-http.keep-origin.http.html": [
-   "c1168e1e0c3704e8e470f65d26c2af1613b49d76",
+   "442ea6e0317c19a8502ab735e9be5a2109cf7363",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/same-http.no-redirect.http.html": [
-   "dcd18e9c90ffd269328d1efbcb3a5928faadc051",
+   "a96bb634c2c77ba16d162831fc8aced21a20f146",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/same-http.swap-origin.http.html": [
-   "947e464ca12f1641c1757624a3e7f715a77e2518",
+   "b7311f60dc9f4a3c997e0de87ae6b11df8a2a0a6",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/same-https.keep-origin.http.html": [
-   "58499fdf5036d8b776e396bf3929932fcca74342",
+   "c08aa615fb83a454af4f7b3e8a68744744e57fff",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/same-https.no-redirect.http.html": [
-   "6a8b94b7e8227410f1cf16955f957172fd6159f7",
+   "abbafe39c3c449ffd4270a7b32c51e65c1d18935",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/same-https.swap-origin.http.html": [
-   "761e211421750d53063b04fa617514da995edbba",
+   "8bed094121eda8b1772cb75ef5e769e79cd5cf96",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin/fetch/cross-http.keep-origin.http.html": [
-   "da5ab1d009dabf3e3baf09b014f3049fce611045",
+   "48ace14fc0211af5e7b5b3acbc00cf822f7274d1",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin/fetch/cross-http.no-redirect.http.html": [
-   "5ea186112998290e3b2df19942d0256e56372049",
+   "eea1c9d23ef2ef0d2587c13c6512196796e11802",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin/fetch/cross-http.swap-origin.http.html": [
-   "e98531f3ea6fbb9fa83972555a75c07c2f5b73d9",
+   "1ac01f95cf51c37984e74eab1b63e626bcce9a1f",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin/fetch/cross-https.keep-origin.http.html": [
-   "7cdfdf01e3a0d7f6f1ae3108d632b91a71d7235c",
+   "72ffa499ba2df76206c9a418ad516364a2f3224f",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin/fetch/cross-https.no-redirect.http.html": [
-   "3e829995a21aca3b757781e6dd0766f177154152",
+   "4cc4e6aee0b6d4d0a0ced9321a31a450c1496abe",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin/fetch/cross-https.swap-origin.http.html": [
-   "82cdb9e1f7af7f3da077c944e53d37c371eedb6d",
+   "20aab6e89cc6b1bd247457ed472b9cb724214011",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin/fetch/same-http.keep-origin.http.html": [
-   "83b5aa77252ced3f5256c9b9bea09106fcdc301b",
+   "730161ba65882d49f98b9fe3936d3b4300b2e510",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin/fetch/same-http.no-redirect.http.html": [
-   "0e10655f574cfecb0891a24a2acfbdd3a2ac792b",
+   "06900b943d1364c67db6a3c1b5896e5a0ff6a459",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin/fetch/same-http.swap-origin.http.html": [
-   "626ec6f8d347c90dadb760698aea6f948a3f4223",
+   "3bd3ffff584d70bebe775d1ab76bab4a19d48067",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin/fetch/same-https.keep-origin.http.html": [
-   "1d3355357119bb9d2cc861fbf9b0ae9c7b43cf1a",
+   "03342b57f7d9dc81cc645151a009e7d09f4dd1ca",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin/fetch/same-https.no-redirect.http.html": [
-   "b14a0eb62b59dcd2ab8b2a0b00124516d3aef758",
+   "0b953699d93bf8a78a1b8cd7ae9c7cccbc5ac255",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin/fetch/same-https.swap-origin.http.html": [
-   "3479de230fad7b6fbc315e8fd33e73784503999f",
+   "fa7bcb6b79c613954905d7ef5651a189a936d941",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin/worker-classic/same-http.keep-origin.http.html": [
-   "5f8779f15d53efc80d76009a4a1c552ca863fcb1",
+   "c68a11182bb370016b06b2354e0ae2fdf599d1bc",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin/worker-classic/same-http.no-redirect.http.html": [
-   "1efca23c97ee19489570dcff20596f94020f2351",
+   "35c7d724cbae90e309565b2531fb1f961577f10a",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin/worker-module/same-http.keep-origin.http.html": [
-   "c5509188f5ec76d57ef835dd379600e471342f2b",
+   "639239a96c205f760eeca47502255fd57f8326f0",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin/worker-module/same-http.no-redirect.http.html": [
-   "2e6db6094856559f6565af9ab2a62e429f2f5e5f",
+   "cafc59adfbb53fa429122230f05687cedcf29c56",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin/xhr/cross-http.keep-origin.http.html": [
-   "cb85c95cf7d4f06e23f4b67bfe17ec4cae2b3255",
+   "b3520eb171db71c725585ab20d3e617635bfe518",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin/xhr/cross-http.no-redirect.http.html": [
-   "c0fc6ecb12a2db45e120ab4109f9d497bb089457",
+   "60cc2cc6873de5154ef41342c2ec080594e214db",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin/xhr/cross-http.swap-origin.http.html": [
-   "a76d66e002eb0fd20aec76bf96d60afab1b03698",
+   "df80d9d36553959b8567a28dd5cd0dfb6ee374b5",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin/xhr/cross-https.keep-origin.http.html": [
-   "7cfdfdd2f7bd5d82f3d6103a6545caf4a51d4112",
+   "dc270ea2b45d01b0cc057cbcabc3d8a700f70db2",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin/xhr/cross-https.no-redirect.http.html": [
-   "d7312ca7109fb1ab91c623bc8fd5197c0faab638",
+   "ac7521db7095690d22be9bc058f42e2a148a4703",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin/xhr/cross-https.swap-origin.http.html": [
-   "72625cf7569c9f5d1f7b782b62865fac451acd76",
+   "a51a6d6d2b4d7e22611336c42417fb07ae424662",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin/xhr/same-http.keep-origin.http.html": [
-   "d918d1cbd9fe614f8897365322ee0332c765b96c",
+   "ee10efe2898fdccde2fccf4ac70ed08575958888",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin/xhr/same-http.no-redirect.http.html": [
-   "b72a394a20e0055672d8cdbeb19c97383251f306",
+   "3e73552977013ee6d3578ab2a324e9c3310c1c7b",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin/xhr/same-http.swap-origin.http.html": [
-   "3a9a57d2780ee60409d1f26c1753df817ef0b6af",
+   "e57c29dcffb5553a967d3e019dd11b044917ab17",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin/xhr/same-https.keep-origin.http.html": [
-   "752fd6fdbee631faaceaa37cbd823d38c11ceef0",
+   "10db4cb622c873648b0999d278118736880ed64f",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin/xhr/same-https.no-redirect.http.html": [
-   "0d926198d6265518e69e4bc869dce614f1973953",
+   "e065fd475045e3056a0246dcb331bd1e1ea5d058",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/origin/xhr/same-https.swap-origin.http.html": [
-   "9c6df197638a6f8746042ce8142c5f8453f7d84c",
+   "7b9230b38c0df1c176d661bd733d168b239631ea",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/same-origin/fetch/cross-http.keep-origin.http.html": [
-   "fe46bfb18db3225d7a4b432404f4921dfa7bcf0a",
+   "c7631351ba3990cdf3b17c90887061856a6fb52f",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/same-origin/fetch/cross-http.no-redirect.http.html": [
-   "941e3cfbad02beb58941c527165fb7a71ddf402f",
+   "6014e39af6f760eae3a3ee8a0ad9157e8456fc42",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/same-origin/fetch/cross-http.swap-origin.http.html": [
-   "d835bb8a8c13ed0b96716fd6686665e9c59ed766",
+   "cba952c299c477061c04ad2a0c0bbd261536a34d",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/same-origin/fetch/cross-https.keep-origin.http.html": [
-   "ce3cc478c3a4235a81c21c160ed823d22fc870d8",
+   "b896713e991f4e3cf4b458838e44a4e388120a10",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/same-origin/fetch/cross-https.no-redirect.http.html": [
-   "970aa8a8f9d5df06eb322c04c9fbd2092a846c51",
+   "9a20a5fe2da303c73d614a1b65419c4f5cca3bc2",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/same-origin/fetch/cross-https.swap-origin.http.html": [
-   "ef337b745303c4eba99ef9abbbb66be438ff8364",
+   "2beb5b804f6bdbc48a7c86eafd1494f62099dbe8",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/same-origin/fetch/same-http.keep-origin.http.html": [
-   "3c45ca857b2428b5b69763440cb78c8f9a6e97bb",
+   "f525d19e5852a8e317aa48b4d19a6393f888b28b",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/same-origin/fetch/same-http.no-redirect.http.html": [
-   "23932cd7bedad24e82d771f90559bd7c1816bb4a",
+   "a9f0e1b6c65510926f5f7092ac029c2afde2b341",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/same-origin/fetch/same-http.swap-origin.http.html": [
-   "88df9f92e3b4c8fbd3ae53670a5a58097f369a46",
+   "af2f6542d69d30a459a10e5b7b75f213407bc9e9",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/same-origin/fetch/same-https.swap-origin.http.html": [
-   "e275575f1f8c0b857018570eed31105b9c3b6319",
+   "9f46518e7206c0effc851869b04a8a7754ff2cf5",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/same-origin/worker-classic/same-http.keep-origin.http.html": [
-   "ca664f3c2498a44e0a6f2518e5cad2cc8e2c0294",
+   "fa7957328af4d67570347b99f37f59ddb2effb81",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/same-origin/worker-classic/same-http.no-redirect.http.html": [
-   "fc3f79d68df6bb5d43031747a8a643470027a251",
+   "61180bb3d6d49b45fcc40adfb0a21ed9a26f231c",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/same-origin/worker-module/same-http.keep-origin.http.html": [
-   "c9ea722bf5f1451b5ba62102e280e38de1be0fc6",
+   "95f6c8ebd804b7da8e769fe4786c5593ba8c0f31",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/same-origin/worker-module/same-http.no-redirect.http.html": [
-   "75ce7b9c59ded5ecbfd001070ed7776bbfa37540",
+   "49db7eb0bb2f80adb866f100b351ece66efa0fc0",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/same-origin/xhr/cross-http.keep-origin.http.html": [
-   "3fc0180ce2560f71d94834b2dd0d5c42550becc6",
+   "c9a0fb20d31192cb5fd397a1378e4fd67bfdd20c",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/same-origin/xhr/cross-http.no-redirect.http.html": [
-   "f18afa664c510407e4fe83f1a5b4b92c8e7c3e61",
+   "7550a8ccab67b250945cf5979a6fdbd4963f90e9",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/same-origin/xhr/cross-http.swap-origin.http.html": [
-   "dfb4cfb7f3db46dc4c5cdc6e330dea92f361f2d1",
+   "d2d8b946ea8184af2fa7db9239283a8badddc643",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/same-origin/xhr/cross-https.keep-origin.http.html": [
-   "f0256941b62e45932bec9ec265ee02bb469b44a7",
+   "7a688a209dd8442516eae963aa1eb6cf79d5435e",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/same-origin/xhr/cross-https.no-redirect.http.html": [
-   "2d0a8017ce084d4e9c71e4874a24ab793c50a491",
+   "821792a1d222210481ec8d1a3d938d5c8dc2d1aa",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/same-origin/xhr/cross-https.swap-origin.http.html": [
-   "8bfc669a2e1dd01193c8afeb858a00c2b4c43e77",
+   "31a2bab7b0f32503d2db248c20d90228f62d5430",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/same-origin/xhr/same-http.keep-origin.http.html": [
-   "ffbaeca37035002391ce00090f810f2135053a39",
+   "0ba5aa4e567f00b33ce5521d6f9096dc21663116",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/same-origin/xhr/same-http.no-redirect.http.html": [
-   "33df3bbcfdf89c9a2242e3643cea2958b12ee01b",
+   "6f3365748eabb94178c967d4951e208e49fc35fe",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/same-origin/xhr/same-http.swap-origin.http.html": [
-   "9e46cc2f0405d368ddd12fb9ed7903120a6f2698",
+   "b7f11716e55dfc28170a06d416c48f3bf6998161",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/same-origin/xhr/same-https.swap-origin.http.html": [
-   "2b5b44f73e8dcdc7054cef043b562945299a9362",
+   "5f02b6f50274fad0c1a7cc6285b7ab439c80c256",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html": [
-   "90d1b34b76e3aae7c238cf1c0c2adda793e29f24",
+   "f481d9f5a212676fada0a012b7048e9e4f154493",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html": [
-   "5f0d0c14a7c38d137800a7e6910d4f38040c8cac",
+   "248560aeb3cd1b6985936a627512925a01f0c512",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html": [
-   "d1e08efe193bd6f505274ff0bb1240b88e67a95a",
+   "64b579b819b92b0d68d64a7d8ff23addb2e92a1e",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html": [
-   "7b35037645f50a6b0977f67a5305b14ee74f72a9",
+   "9e314756d3871cd0f3c0f64415363ed23c9e3441",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html": [
-   "b9fcad92b606c0bbdd1a0c2a5feecef42337c5e1",
+   "e026230304079526692256667081b907282a491a",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html": [
-   "3a064f0e6098017d4a9e3fa1c1179a250b67d372",
+   "ce01de639fc0fbc43f64d525c5f9a92fb5e3265e",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html": [
-   "622c3105e74fc9643dc00d1df35fd5dfc10672ba",
+   "5fbd8a56376be56e0eb64babee9e0e451f06e108",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html": [
-   "456470ba3b901afcd1013073fc9d73edb0dd7db0",
+   "bccb924537c33b0fc95a2a4ecf85ea5e61ff2550",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html": [
-   "016a7e351cf98a15968f77d14188c71c7e4e5205",
+   "6dfd5d33c265361ca8198d009ddc4e2a90722359",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html": [
-   "11b8af7d62a856723910e8994600146274463239",
+   "3394b87c727e9e7eb2fcfac6833b7a4de9eec680",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html": [
-   "478a6e9cc3ad781f6a6dd5514d5cd10713dd8ae4",
+   "efe8f5e647084fed008f61504458e14f47582765",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html": [
-   "4a20ba61ba8c0f06e08b2883ef339ff15a6e2039",
+   "849670a060f450536a1a1700dedf9aed29672f50",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html": [
-   "05ce6164fa64c32efc01602476d702776bcbe06b",
+   "7a9386a684f548215350f935e7c8fba9ca6d1399",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html": [
-   "99935de7cf95f8ce75856629c8f691a88a472a0c",
+   "cbbe55e82228e69a3edea850c0e6648a6de3f25a",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html": [
-   "1f995a6f45f436e97fbdb86745101a4a3826b441",
+   "27ed0b5ec84fc691dcf34d395928e4af6bda2523",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html": [
-   "5a010ce546bfeaee0e2bc75ff1789275ba7fde6f",
+   "f44d5344c5c9fdafa13b04f40ac5bd0d26af5c63",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html": [
-   "882ad4831b3d51b020e414fb3406f0d16f81238f",
+   "91e470231a4b0205cf636ca724f0901a1ffae1a1",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html": [
-   "641d43fcc9b3e41c6b0c60c52f74bed18ae0954c",
+   "549821f7512519f5cdcdcfeab07360763c1010a9",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html": [
-   "243de3eb4fa10b1eb27300bc27881f8d74f689cd",
+   "79f79f56d01a4687eb2c439a04812575513db9b8",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html": [
-   "6e880206eb2606c746bdd5a147d4495be16ac296",
+   "9fda252bd4b159a1dd0784a5ac82058b0c0345cd",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html": [
-   "eb8d89951ff806df7ea664f0259f6a0f9dba3eee",
+   "9dc86ffefb45fd481e73b2e79a7477198ad0418c",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html": [
-   "4a65e04cb47356864e6bc8911f5ca6b686e23be1",
+   "1507b217f9b572f3fdef99c63324fc46370aeed7",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html": [
-   "4839c083a3d301696bc781e71fe0a5df519b713c",
+   "74345f2c6f9c8cd6b56c79c734fb9b9b1fe5c75a",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html": [
-   "5a06b7289e52da37d059ae74d26f664cc9c0a674",
+   "fa3be90d6714f4077bef60087c94e38b1b4108b6",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html": [
-   "db5e0c7d82e348b8cd89c86fefb05e85e4088ac9",
+   "9a60398d6845a360040ea47132cea3c75189c1d0",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html": [
-   "38bfcabc3ffc8d043500259cf8b78035378e2a1c",
+   "aa51156c0f98feececf676476cd26dd804172239",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html": [
-   "a5fe5b441cf15033e0fe61b089bf31d63088b3a9",
+   "a853214df4ea276597d27442e292c5423e3c588a",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html": [
-   "2312589b7e52dfa56e3aff04bd342c2ef206116c",
+   "1d732252e5ee187b387c8208604d5f6e575f29d4",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/cross-http.keep-origin.http.html": [
-   "d82eba968f3beec06db48e40f750ac522a194d3d",
+   "7a178fb5cefe7b8da13836bbca0f38fe5d4119ee",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/cross-http.no-redirect.http.html": [
-   "89206428d25e6f87d126652257244324bd475d26",
+   "6946b07bd344b9a312ebcb7623511ce42f86bffc",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/cross-http.swap-origin.http.html": [
-   "d1155320397516e36fdfc48400112a49e0bd0736",
+   "fa449166850af76f0650b6fb3b2605838795bce0",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/cross-https.keep-origin.http.html": [
-   "4bc5fe6e0e66387d4816a9d8a50c657f903da911",
+   "bb496473158d84f2336a95e84466d3ae28ea22ea",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/cross-https.no-redirect.http.html": [
-   "515fbfb12b4053b51411f28c4711dcc6a6d33052",
+   "2b149337164f092f5b3680beed233a28526f3482",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/cross-https.swap-origin.http.html": [
-   "c7db5997b9fb3d3ca6aa2962abc5ff7af0cb93b8",
+   "fd507dc25ac713451e3f91de86510f7087ec3e1d",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/same-http.keep-origin.http.html": [
-   "a12444412815b933f2317d240ca9cd4b6b64b03f",
+   "9531148cb4b789ce1b7e47a76fb489861a74c9ba",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/same-http.no-redirect.http.html": [
-   "9fa6617e51910cb81cbb0bffedb30feaa41145f1",
+   "7af0965bbcfc5263ce0d40f1bf4c99f59672e178",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/same-http.swap-origin.http.html": [
-   "1b4961d339215390408426d3c8fd36551c00d692",
+   "c96bca8e16a72ad9e2867636916a0f78f544e9e1",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/same-https.keep-origin.http.html": [
-   "18f675a3be03e7c83b1178404f36c2c379f82a0f",
+   "4ab844150034b2fd57c399f8bfbb57813003ad29",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/same-https.no-redirect.http.html": [
-   "6c9e78f30147478ab13d205608b7866ee8590db1",
+   "41d419152675d0305f23940681e106b244ed25fa",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/same-https.swap-origin.http.html": [
-   "b7d28caafb3617be17909e68a6bcfe6e2a07d479",
+   "00c48f598961c3aa14a922f8184b107378f8442c",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin/worker-classic/same-http.keep-origin.http.html": [
-   "215b3edf4f808b0d617ffe509320c5b59510e7cb",
+   "963e40df49ccdf5ab68ca0a562ec5b8ef9766559",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin/worker-classic/same-http.no-redirect.http.html": [
-   "64733a5f5a7533d18eda26fe6893100d55591faf",
+   "732985bc4ccdfbc68c8c2632e941f0b54d766d1e",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin/worker-module/same-http.keep-origin.http.html": [
-   "b39461bc683c94af710efe0e69b67a838e7b7178",
+   "88bbfe1bc166abf35aebe81ead7de45980b081ad",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin/worker-module/same-http.no-redirect.http.html": [
-   "4031424d33769129fb31ae50ccdddbe675d79c8a",
+   "88724a6a8b14cd90d1a598260c5878ec15d3f164",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/cross-http.keep-origin.http.html": [
-   "412fe07e57407214895b8257195001d4d4362611",
+   "8e83ead68782cdffcbec6815e57eceb570be047d",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/cross-http.no-redirect.http.html": [
-   "18749d4289af0ada7d29252a1bba79a4f0d091b6",
+   "884a0be11e01eb38961014ec5a61198840d37482",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/cross-http.swap-origin.http.html": [
-   "d09d298f9bb403d22fbd7476944b779560d084a4",
+   "1729cafecf9a863c704f5961198ae07c3038984d",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/cross-https.keep-origin.http.html": [
-   "238f77d1178c3723a0ca8511fbd9f6a6fcf00598",
+   "6bfcb3e7be71c2223644260459dd78185ddd516b",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/cross-https.no-redirect.http.html": [
-   "64e5c9a2cc5b11ca7637bd4356ff298dfee61dde",
+   "c3a62d2215d144752ae4029dde98bb3737dfd208",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/cross-https.swap-origin.http.html": [
-   "1d95b2aa34d053512439197d5b16d2660696119b",
+   "63b71ac7753718b6fad99c14cd49cae992fdd235",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/same-http.keep-origin.http.html": [
-   "403f3e938ee8e6f6f98eb90f3dac4489581f80b2",
+   "ed558957b4ec9b3dad125cc1d6a2df023382bf3f",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/same-http.no-redirect.http.html": [
-   "191179ab804d574d56797ab17515efab3ff32b9b",
+   "3334ff974ec4c272a749cfe1b126fba4e2832a53",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/same-http.swap-origin.http.html": [
-   "14e4f635acbd4b328daa67e5bf365ea463e63f26",
+   "c4f9cb93c5e7f0cac8f34ee828239e8b1f885b78",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/same-https.keep-origin.http.html": [
-   "5074805d3dd5f84dd94f3116971316fa4327e2d1",
+   "b7c897fdaf5ea619031d3fff34a5a93a6bd6dd3b",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/same-https.no-redirect.http.html": [
-   "7562c4417d86d3f0d77e2700b54a8aee372e8881",
+   "fdf56bbbfced7fdf61b633e317d7cb3aee260289",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/same-https.swap-origin.http.html": [
-   "2fc3c9724d7a4cc8281e7e11296f4914f5d08c31",
+   "220f73a75b02d0bb57ec7355df81008ec4d9d91d",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/cross-http.keep-origin.http.html": [
-   "955369ec7bbabc17bb2282e50405c8126615cbf3",
+   "e90b237a3474a74f0a39fe55fa4d48bcb3b15814",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/cross-http.no-redirect.http.html": [
-   "b5f3302a03a29073cd503177499e40271e75f039",
+   "60a64641423636f9188bae73f80d0a9829a1ca7f",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/cross-http.swap-origin.http.html": [
-   "7d56f9f8b383cdbd8249e332bf4985c50d8b7d57",
+   "1ef980301973347f16e76417ac8e37602d9d8318",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/cross-https.keep-origin.http.html": [
-   "04c561d613ea505f9f7a6484ee848180a392ee98",
+   "be7bee7fe28dcb1bc59a5056125bf407f4023ae0",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/cross-https.no-redirect.http.html": [
-   "0edb354842eea47d3e28c003877b8317a049d330",
+   "7cd678646a7ec841de8ad8db13daadf48b822351",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/cross-https.swap-origin.http.html": [
-   "6312f93a211b015370d14769c6e35e4ad0042460",
+   "f3e5ddf1866acb664521faec6a14493853335ded",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/same-http.keep-origin.http.html": [
-   "c92d12158c28e82fe6ea9c39bd78e54ccffec864",
+   "161c346d9775f693f08936c6ca1987c77b5633f4",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/same-http.no-redirect.http.html": [
-   "eaea95ad6a3b3f8c2ea4b41656f2c3b6df2caf09",
+   "79675b86528d495d354b2d8d0c6afc8f4ffa80e7",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/same-http.swap-origin.http.html": [
-   "f065e43adad90a7bc1e56813172110a9b9457b23",
+   "0c0ad4f1dfa66c12df0207e1dde0f5135a4acba0",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/same-https.keep-origin.http.html": [
-   "29c645149b92195dce989b47a7c12dadd0c54ba2",
+   "5624607190b9dede8cf98f9dbe01161b37f38f3b",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/same-https.no-redirect.http.html": [
-   "fcb96b869be8dc3df3bc0a33133b45392a016425",
+   "54e79c9f453c1791c7751ac70dd03572b87ddcc3",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/same-https.swap-origin.http.html": [
-   "e918da49e6dd624787f38deb22f0f301d2904194",
+   "74be6bef4d3f517f619d1d4f52f95c38421f5f0b",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unsafe-url/worker-classic/same-http.keep-origin.http.html": [
-   "acbf9e02edae9f9fd821f89ff667d39ebe38d537",
+   "5f667ba8d5e2d29e2e5b6e0b7927f36f81043bf8",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unsafe-url/worker-classic/same-http.no-redirect.http.html": [
-   "7824eb443fa5b399964f0e5d1b05a4ae56a13539",
+   "3bc18ea783f33b1ef5b3a38e439322fe470a390e",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unsafe-url/worker-module/same-http.keep-origin.http.html": [
-   "6940fbf9317d03dfbd528a647dbc6b53c2cd115c",
+   "907d1553b0d4ba48b11ce2d3f860514fea68e585",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unsafe-url/worker-module/same-http.no-redirect.http.html": [
-   "e968ee812ee84c9b297c6e26300925502658981e",
+   "8280d61f39f35ddae8abbc78f6c2790eea18dc4f",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/cross-http.keep-origin.http.html": [
-   "a74f146f721b7c336d7ee1206917532d841d3e1b",
+   "c84efa19a9a3d7629fa5d0a2a8b5f6862fecbece",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/cross-http.no-redirect.http.html": [
-   "636696bbd8a12582f164f07bd933926166b4e14f",
+   "080d448771a92e85364d0a97c5361e60e98a0eb8",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/cross-http.swap-origin.http.html": [
-   "53fb44d2a8bbba37f6f7106897a2b0db5e926f7a",
+   "dbe7659d870e5717853bffd9948f6f2362403322",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/cross-https.keep-origin.http.html": [
-   "2fa9a68e110e7b9bdbf399d0aa349d1e7ebb2baf",
+   "1d92d6de03d7c551e27ecf61c7dfc32b05609498",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/cross-https.no-redirect.http.html": [
-   "a9d158ea3eb3f45170177a489185655c9f8d8725",
+   "d11b4ee5f60fcf0e142b5782353907e4493cf364",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/cross-https.swap-origin.http.html": [
-   "24deef5b129fcf6c790f121bc6d33a38828c7a44",
+   "f4116fd9d122dd0934bac571800a5033d95e0db3",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/same-http.keep-origin.http.html": [
-   "27f58ab50bcea716e0c8391cc56dc3bea050c37f",
+   "d550e1ce40c388ee7884ed02159df1d822eb795c",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/same-http.no-redirect.http.html": [
-   "2d5b9e2199cce145cb9f9b18c156c8c316377e7c",
+   "f2d8e8cf3d52fbf77d448e8f01b3fd2d03ee92e8",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/same-http.swap-origin.http.html": [
-   "d90adec850c784151f7b4d6fc2537971983753f1",
+   "8b2ee729768eac0a6adfbc6943076a1093504067",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/same-https.keep-origin.http.html": [
-   "7d219765d862256abb808fa2f7696ede1d592dc9",
+   "9590e6af037aae53f1c29fdf4bd0011ba417a471",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/same-https.no-redirect.http.html": [
-   "0ddc6b11b9a8134d79919a45afc589ef10d47c27",
+   "731349ba25fea48dc7c14683b1b5c67f4772304b",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/same-https.swap-origin.http.html": [
-   "50926c70bfb0dd694b892bdc2197b925a56421d1",
+   "15dfe031eefd0fdcd5590f9ec7d91669b8895d9f",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unset/fetch/cross-http.keep-origin.http.html": [
-   "f341ec99e52153b6fbbe502e7824dc0dd9bac4a2",
+   "ac262b509c086541d49e1b04e01f74c99e624373",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unset/fetch/cross-http.no-redirect.http.html": [
-   "760bf977119788803d5f41d27cc98e605f459ff3",
+   "d56b994ae57f12504f4bcd9b0234dfd268e18b65",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unset/fetch/cross-http.swap-origin.http.html": [
-   "43023a21938d939020509873c4a611f20dacd177",
+   "ed3d3d188154ef835e49f8ef7538e1e275e8ed86",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unset/fetch/cross-https.keep-origin.http.html": [
-   "d854190b5b16454df4cdd08f5988d1a861cbbf6a",
+   "d0de32d414b1ffe2313ce02bc251313141dfbf09",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unset/fetch/cross-https.no-redirect.http.html": [
-   "210fb465dc813c40cff9c1301f6ecad4edbfb3dd",
+   "ce96aacd3e2959eab66040f86e37184a081e423e",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unset/fetch/cross-https.swap-origin.http.html": [
-   "e19fb082d644e68c5222408d341fd9acdc9a29e3",
+   "f641586fda401c74a08f03d1cba8c1799593d62e",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unset/fetch/same-http.keep-origin.http.html": [
-   "9365ed50ac112150195a7a8c6a92f331be1a6852",
+   "da106961a25c9db0927864b22633da67b9a33add",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unset/fetch/same-http.no-redirect.http.html": [
-   "ea8a0130c689da0d6d2ffcc1c29b4de3ad9656b9",
+   "ae97e66b28ef31563193a1a256d46002f9b20c6b",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unset/fetch/same-http.swap-origin.http.html": [
-   "17122d38f52c3a23e93041c9a09ae3891c63058c",
+   "dc8420c83220d8504f1495c5c8518a44e1f1df85",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unset/fetch/same-https.keep-origin.http.html": [
-   "99fe324238858a80a0fe0cc3fc8655529684759b",
+   "e35002aa93fa86e850686644954c70a44a1f8cab",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unset/fetch/same-https.no-redirect.http.html": [
-   "ce0bce54fbef62f3549356b1c0e8f7bc99629a2e",
+   "d0aef00b0b82d31a130be40ee15ec1c5bc3f05ae",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unset/fetch/same-https.swap-origin.http.html": [
-   "b51a46c48350d3f21c9ebbaa514037f72e6a8c00",
+   "d659b2e417ac1c148113e0f742332b1e045292e7",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unset/worker-classic/same-http.keep-origin.http.html": [
-   "f2266188fe9dc4278ff9e9317ba482b83a916049",
+   "320c613e2c7e7902d100ea4b4528a84d7c3e5ad9",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unset/worker-classic/same-http.no-redirect.http.html": [
-   "3eac1bfb8894c89c34affff6d15dbff7745a3c39",
+   "95d7966ff08b49d43bcf697f7bff117abb8b032d",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unset/worker-module/same-http.keep-origin.http.html": [
-   "a7422bf0f9c25c7ffcaec4e1305b32dac28617c7",
+   "9a7435fb0ebbe071304b0a71d362564044affb1e",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unset/worker-module/same-http.no-redirect.http.html": [
-   "fd43de265609df2d4235bae278e29e50e801b334",
+   "60a84c0c237405a84a26723f708fed6d63cf09c8",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unset/xhr/cross-http.keep-origin.http.html": [
-   "47b181de913e87f24b47c15ce358d37f23a47908",
+   "80913252f5b4dee9559a391335728fe7b0caccdb",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unset/xhr/cross-http.no-redirect.http.html": [
-   "3b22ea6a5d5d7a667971e2e385ad8c4d3a87da02",
+   "036fd597f4868052e6c5da9771fc76098e2c5f94",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unset/xhr/cross-http.swap-origin.http.html": [
-   "9cc882e3b3b7a695dbc055b0b04684333a72171c",
+   "c8d4fc0c48fe09b7a993b4bb14552117a85bad12",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unset/xhr/cross-https.keep-origin.http.html": [
-   "4bbe1d761526f95063d1cea8e26e8f6970dd00f7",
+   "e9643395ab380c7b501add177159622ae97d2bd5",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unset/xhr/cross-https.no-redirect.http.html": [
-   "e2208cba1ce5d10adacf70bcdf6a4c99c84f8fbf",
+   "faae5d5928ecd02aaf4a4521d9ad758c52980821",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unset/xhr/cross-https.swap-origin.http.html": [
-   "dc7c389d0cff6396d8bb5fafa670a85b577bb5f5",
+   "e9bb2395477ff4038ad686650624dfa1e52018b6",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unset/xhr/same-http.keep-origin.http.html": [
-   "d7797a75e29f2e7cb9d23f744719e09287c0564d",
+   "07a3e6ede152569504ac4e8f9aef12ff8498d7d6",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unset/xhr/same-http.no-redirect.http.html": [
-   "350cbe30a0b9b8f5d407d11deaa2a21c7f1c6048",
+   "95fdd6ae78d99d529e9a4a792e127d118d56b9aa",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unset/xhr/same-http.swap-origin.http.html": [
-   "b4b372508ed9aa7d044e7bc5167880aa3e2ba1f2",
+   "e960815b069af43669b06ca59b4e18b68de03796",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unset/xhr/same-https.keep-origin.http.html": [
-   "47951e9b729aa5637ce17bf9fe1a78be34687537",
+   "ab316a05de76b0f386169a23829930f04968fd1c",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unset/xhr/same-https.no-redirect.http.html": [
-   "46d85b141d399e655ff216674bb7a31d8015d7fc",
+   "77dde1a8902a42fb541355ebe75221a957e29f30",
    "testharness"
   ],
   "referrer-policy/gen/worker-module.http-rp/unset/xhr/same-https.swap-origin.http.html": [
-   "57a3e7c5d8da5ef1c1cacafe423598f5a842f10f",
+   "6258675a17c11cbd2440f20e7044044f2e341fdf",
    "testharness"
   ],
   "referrer-policy/generic/iframe-src-change.html": [
@@ -702154,7 +701985,7 @@
    "support"
   ],
   "referrer-policy/generic/spec_json.js": [
-   "cad5e79f1f8b80bdc54f2f8e861d821770b29721",
+   "27961c5de5c1b488e87dd52e1c79a5afa7070e7b",
    "support"
   ],
   "referrer-policy/generic/subresource-test/area-navigate.html": [
@@ -703042,7 +702873,7 @@
    "support"
   ],
   "resources/chromium/nfc-mock.js": [
-   "84c2726e09b335c12ada7cc922d8acefa21ae805",
+   "9211b8b70585d785340f29ed48086b717b08034d",
    "support"
   ],
   "resources/chromium/sensor.mojom.js": [
@@ -703102,7 +702933,7 @@
    "support"
   ],
   "resources/chromium/webxr-test.js": [
-   "54788b4ca3de9fc99dd01d2693829bd5be08956f",
+   "ca627543aa48f6cd295b69fd34047d382763cfa3",
    "support"
   ],
   "resources/chromium/webxr-test.js.headers": [
@@ -704006,7 +703837,7 @@
    "testharness"
   ],
   "server-timing/idlharness.https.any.js": [
-   "ded320f0f61f4de1132d5cfb76a7e74a16154f3c",
+   "b55c741df39e4766afd438daa9037b216b7780ad",
    "testharness"
   ],
   "server-timing/navigation_timing_idl.https.html": [
@@ -714294,7 +714125,7 @@
    "support"
   ],
   "tools/gitignore/gitignore.py": [
-   "d5ea4a6a8f3d64d4aba3b8dcbe5ffe849b74e969",
+   "0f3d9450d123449c0dcc3ff3c04ca86c81b24bef",
    "support"
   ],
   "tools/gitignore/tests/__init__.py": [
@@ -714554,7 +714385,7 @@
    "support"
   ],
   "tools/mypy.ini": [
-   "ac8edd37d3ac2904133a12ee9e7550dd5a487238",
+   "b943b6d089a4b8f81e9b6e23c76880fb93cf665a",
    "support"
   ],
   "tools/py27-flake8.ini": [
@@ -720690,1431 +720521,1431 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/fetch/cross-http-downgrade.downgrade.https.html": [
-   "b85583ff2cee179ac58a7c429c79400c438c95b2",
+   "9c9de003230311ff0689f2055ec165d224c7f16b",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/fetch/cross-http-downgrade.no-redirect.https.html": [
-   "df420b3b9228a6cbda63cf7de47d47984c9cf9c0",
+   "13c51ce256f3b25b7a790f2bf53284869f189d93",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/fetch/cross-https.downgrade.https.html": [
-   "d4bb05e83072b72b3e4910405db72eda6fce08d4",
+   "3135cc6c8f9eee3a1566c1fa67964debdebc99be",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/fetch/same-http-downgrade.downgrade.https.html": [
-   "6d15509430aad2f17f9412b28f5b7d1f5a0b3565",
+   "4fe6ab5bdce12a6f2566d59174a1c6493c7bc695",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/fetch/same-http-downgrade.no-redirect.https.html": [
-   "7a7fa666b061e0e8f9ff820bc82aac35b2af171b",
+   "7447bbe3264cd5113c46e373d41d76684d651ea2",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/fetch/same-https.downgrade.https.html": [
-   "f4a2cf3b00d76ae9c0922f440951f1638bc793cf",
+   "229c395f0c74ea3599433dc42e63a4a0a281ed77",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/iframe-tag/cross-http-downgrade.downgrade.https.html": [
-   "77d852eb7639e5916230d1ea7c0fee6a44938a40",
+   "ccb1ba7640908ec5fb958a7b0c9ac8c1b1e3ccb5",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/iframe-tag/cross-http-downgrade.no-redirect.https.html": [
-   "8ddeada8b824951fb268d07fad6f77b7a91d2e70",
+   "9c6aa96442524d778968130c939c50ade257ed04",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/iframe-tag/cross-https.downgrade.https.html": [
-   "ae8d161caec34dab699c2e0f9761473d18ec025d",
+   "4af67909eea0301e859a2c832c5de5113a5a0f00",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/iframe-tag/same-http-downgrade.downgrade.https.html": [
-   "32f330f3d5cec35afeaf98e9956543f5206dfd06",
+   "608b4799a687e18247abe8c630187ebbc9edfab0",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/iframe-tag/same-http-downgrade.no-redirect.https.html": [
-   "52dd2dba9f71a9cd43232c29ad290cf34ce40080",
+   "b114aaba58530f5b482147c9342560c6536d6f48",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/iframe-tag/same-https.downgrade.https.html": [
-   "884636534e0a6d68d3aad05c6d9c86f947e8f442",
+   "fb1cb53f2e91b8cc7f327154d2d7d54917aa50da",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/img-tag/cross-http-downgrade.downgrade.https.html": [
-   "4e663d506f025b2a91ec37cbff82aae3c6a71bfe",
+   "42d1d89905d00bcf632fcace64609aaa1cca8bfa",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/img-tag/cross-http-downgrade.no-redirect.https.html": [
-   "3fe338de501f589a85ebb45276f4c1d69c2dd752",
+   "d7e03c78914545219292f2d8b42fdea8e46fffe4",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/img-tag/cross-https.downgrade.https.html": [
-   "d3b84f01637bd100163b31fbd740572c1205ea91",
+   "ea90dcf5f2d649ab9efc38f5cb7ce6f61c2e7b9a",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/img-tag/same-http-downgrade.downgrade.https.html": [
-   "e6f8e35fa213124ccb53e365bbe14ab09891a456",
+   "702c96a1bb38e35165a900dcfd3956c2c849c22f",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/img-tag/same-http-downgrade.no-redirect.https.html": [
-   "0ad5ed13aa5c642c2985a27a3ca715b602c83471",
+   "1975708b895b4258a8731650c2963b3d911c8885",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/img-tag/same-https.downgrade.https.html": [
-   "bd2ed054cffed919932a4a15680e05a020670060",
+   "931e800173af094b39a6a3374b1291ae53352b14",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-classic/same-http-downgrade.downgrade.https.html": [
-   "86b0170706acd17a37d3a722734533e2dcbc9940",
+   "721e35973858e77b675f44206233054ceab3e8be",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-classic/same-http-downgrade.no-redirect.https.html": [
-   "274908b2b64d96e0abe0d0010f23f39c02b7bab4",
+   "f6a0cdced13605ef8004a3a50ebc04f5e4c0a67c",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-classic/same-https.downgrade.https.html": [
-   "763fbd6d4aeb1e5ad5d5034e979602f7618f1263",
+   "e3181df0e5017d9730f56b2b36e1d5a8b507f749",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/websocket/cross-ws-downgrade.no-redirect.https.html": [
-   "fe77266af21527d0e5a5a8bb5ae816f01c327a43",
+   "d85c6364cc59c52ae198d74d862667bd645895de",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/websocket/same-ws-downgrade.no-redirect.https.html": [
-   "7e27068e2fbd8e40b1d8aefcd3fe4450de8271af",
+   "248a1c36c13a36b9c6c3565c90beacff7d2beb9b",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-classic/same-http-downgrade.downgrade.https.html": [
-   "1144a7b9b11b5a69408f347f953ae6e971f48bd5",
+   "09afa4a1ad5f36338f8b0b86911d1ff28ba36d75",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-classic/same-http-downgrade.no-redirect.https.html": [
-   "47ecc6f9946648cc4c61eec0a8d8efcf880ba736",
+   "6b84e67ef48aeadb3e13c653b0d061905fb2820a",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-classic/same-https.downgrade.https.html": [
-   "3a75e263c7aa2c94fd9c985e634602dedd5434d8",
+   "bdd607e66e2bb1db79390e31ae0c102121be8b2c",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import-data/cross-http-downgrade.downgrade.https.html": [
-   "cfb4519dd5be2488d077473ef43eaeba4af26888",
+   "4d52cdeb1fb62373f15dcaa23b573b98f36ef33f",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import-data/cross-http-downgrade.no-redirect.https.html": [
-   "79e6ad251013ce23b31c6e1ff0efd7cc769d7a1e",
+   "c9bdf6593f14f3693d52b9ada0a4fcf4c7a2ef79",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import-data/cross-https.downgrade.https.html": [
-   "68064dccb9a0c84d332e1fc716464b08aeebb649",
+   "e67e525a19fc57959a45a6711fd7d8c7b83f43d0",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import-data/same-http-downgrade.downgrade.https.html": [
-   "fdb0f73e510d3fabb8c7a935fbd33b66993ad8a8",
+   "431ad44a837e50e485e230a379de891bf55851dc",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import-data/same-http-downgrade.no-redirect.https.html": [
-   "df11191e3708f6c67265fc524792c727f2a3a845",
+   "5f13b36693940b4eff6218f03878ccc4c522c7b5",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import-data/same-https.downgrade.https.html": [
-   "e3e47cf713a06890845053fedff8c0cf029f1dc9",
+   "4d25d60c24b24361fba25f15b54d9d2d36fbb282",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-module/same-http-downgrade.downgrade.https.html": [
-   "5976eb13ac0c78b5485af3b8e2dbbf161213f55b",
+   "a7ae596997c5e57f23266d895761046ed04a5b37",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-module/same-http-downgrade.no-redirect.https.html": [
-   "61932351631d2cdf429c0bf420e0dd35f2215580",
+   "39354703b0166fd37f41aa9d4fdf401e923feca1",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-module/same-https.downgrade.https.html": [
-   "6c0cc3a6051427d4fc8e8a768af8eca459be685e",
+   "e638a447f990c88a16df28f33b6097d22f5e3bbb",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation-import-data/cross-http-downgrade.downgrade.https.html": [
-   "73f1ba54fd4bddaffa834e2ed2d8442cf35429e4",
+   "2b3bb7e22959ed0284884e6ef36db9268961d16b",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation-import-data/cross-http-downgrade.no-redirect.https.html": [
-   "0267b811121c1939fa46b46379fdc25a2b45a7ce",
+   "0e9543f869e885cdc0ca3fdc7b61aa7dffb68e27",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation-import-data/cross-https.downgrade.https.html": [
-   "dc014dea99c19768d2164cc10cd7bb4244c9c188",
+   "df1c0cff004ae31c0e9e262e14f78ab6487771c8",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation-import-data/same-http-downgrade.downgrade.https.html": [
-   "781d3c656923dde6f968f771fd6d44cd66b3c36f",
+   "fcd6e8a362f6aefd72e70132ceb63e18fece8270",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation-import-data/same-http-downgrade.no-redirect.https.html": [
-   "9475c532a51bdfaa5605bb4f6a0f1f7da1fa8caa",
+   "c7418b6ba9d0d41f3cca398ee5a3f2059b3019d9",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation-import-data/same-https.downgrade.https.html": [
-   "7e574f94292e10f92cfaa18ce40f7648b8bc577e",
+   "66cca764cad77de7fb584321a7ac3e209130a543",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation/cross-http-downgrade.downgrade.https.html": [
-   "8e0e431c156c4ffb0007aa7ac2bb576ab879d4e3",
+   "4ccda7638c9f539a5cb68d5efed613f32866889f",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation/cross-http-downgrade.no-redirect.https.html": [
-   "70314595f530880b122a953575eb5b0b26b71548",
+   "17a743fdc2a33094bdb1379213a010019bab26b3",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation/cross-https.downgrade.https.html": [
-   "126a81d2e1c5b6eac6da5c6524d39cfb49a33892",
+   "2d151d9942b94da7e58790b7fbd0f6739dfe4021",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation/same-http-downgrade.downgrade.https.html": [
-   "9c4e0e292359d3e83f6509717906edf67fac48fc",
+   "f15034029de691768e8783e3689b8dce65689685",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation/same-http-downgrade.no-redirect.https.html": [
-   "1360503d81b0246a9c71bd3d47c62f911b0c3e90",
+   "3ec31ffd10e60e1e557879150d493a92f93e58e4",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation/same-https.downgrade.https.html": [
-   "5ed35529540118170928ea2204f564e50b2ecc4b",
+   "522553b624b5bb9865ba253d64645617aaa69803",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio-import-data/cross-http-downgrade.downgrade.https.html": [
-   "a61c8f79f39578d39f92827dd1feb51279fd6457",
+   "cad46225e4a14cdfe1cdada152e1aa5260092f13",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio-import-data/cross-http-downgrade.no-redirect.https.html": [
-   "61b78e828321ea7ff3a1aa2b7f576f4fd230c820",
+   "9577b03b199020081bb24d089dadcc42b5bcfdde",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio-import-data/cross-https.downgrade.https.html": [
-   "e4d12ee64c5d15453e6a385e4393aaec3adcc907",
+   "cada0f4f0c0330d42de4b485afd5d269eefbee78",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio-import-data/same-http-downgrade.downgrade.https.html": [
-   "806e148059eaae586e2a111bdef10020c1763853",
+   "6fb498e0e6c7ddcf2bbaf3f0889e99acd957d2ee",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio-import-data/same-http-downgrade.no-redirect.https.html": [
-   "11890a310b9efb5e270cb80fb3abe636e929cf32",
+   "1bd15a79d1b97caa514c913f754371d6b3ba736a",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio-import-data/same-https.downgrade.https.html": [
-   "4158e4e4eef1038f2e5ef44cb538fccb26575717",
+   "3f2b2407e069eee5aba236a9875994fda81bf8c5",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio/cross-http-downgrade.downgrade.https.html": [
-   "032ddc9c40ac6759503b6ba12dbcc5543c49cbdf",
+   "408ee4c610f641c0a592bba3302a49c5da36b978",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio/cross-http-downgrade.no-redirect.https.html": [
-   "63081ef51f2c68ee3405f672144d89ff55e99658",
+   "a717fb6abeb39d2a9e7d0472f6bad43ab2ebe016",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio/cross-https.downgrade.https.html": [
-   "abd52ef4dc1efad21a10233aef1729920238708f",
+   "612e119b294f6ba61e8d34eb448ae3cc38616056",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio/same-http-downgrade.downgrade.https.html": [
-   "9c7b931f3ef52379df464764d343a46ee6d7c4f0",
+   "a1f795f70b73bb7851c32cad5ecfd4352c0f7700",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio/same-http-downgrade.no-redirect.https.html": [
-   "4cfa5018a38747c823bf963f39a38701434a67bc",
+   "678fecd445ae743bfb09a5716e0c935d0ae13d95",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio/same-https.downgrade.https.html": [
-   "a4aebcbbd98178fbcf8aaa8be5f699d4c9495aa8",
+   "e9c11fccf5ce4bf164735e0282b1ebaa7707ddb6",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout-import-data/cross-http-downgrade.downgrade.https.html": [
-   "8eb246cb3a1efb5cc5123949427db4e318050697",
+   "2b5ad96119638bea0b527194c17909d983725677",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout-import-data/cross-http-downgrade.no-redirect.https.html": [
-   "ce5fcdc9cfd58c85b014595d09f6fc3430c56891",
+   "1799a9eb722a6f4fb393c866ed1f5fca4732d14f",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout-import-data/cross-https.downgrade.https.html": [
-   "a765c02906a29016552b57307377f87838ef0556",
+   "f7d0927e3322701285d5be8fbf86e4afe3f7e54d",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout-import-data/same-http-downgrade.downgrade.https.html": [
-   "d83ecefa811210c65b677e21f2b156b47b02f547",
+   "2d7cca9fb4b1d9f2f013523e6b6ccc3ea6125d37",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout-import-data/same-http-downgrade.no-redirect.https.html": [
-   "d7d6ff4f9d53fa9dddd0928ba30acd8e105f8181",
+   "2195c81344d5f384e3b91513fd19c1903cdb1699",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout-import-data/same-https.downgrade.https.html": [
-   "34b9b4a53504727e46c42e46fd1fbc0654ece2d9",
+   "21103ffcd28d54150d599ac34a9a1c64970f5acd",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout/cross-http-downgrade.downgrade.https.html": [
-   "45715ea321e9d98dbdd0bf91897b3adb0ff98c93",
+   "ec1b48ecf2c57b30457dd69747a313b309bdbc02",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout/cross-http-downgrade.no-redirect.https.html": [
-   "99a80ac234926f58c34c5ad64eafcaacda3bef1b",
+   "ebf1ddc2ee52c1cb55158dd1496d75ad14dc7567",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout/cross-https.downgrade.https.html": [
-   "2776905a788b8077d6f9114f5352b7e15965c94e",
+   "9643c59f470995140cce9e79a4a686d7a1e5c21e",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout/same-http-downgrade.downgrade.https.html": [
-   "275dc056892b654ade7ac28ec3a8a657eeed0326",
+   "578aaa888806f9c0c4dccd747ff3419f24d89dcf",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout/same-http-downgrade.no-redirect.https.html": [
-   "3f72a04ab5caf976f8973c1e225e9712fac55e4b",
+   "19af6b4ea00d8e5e0cb1cfe76719a8844d497ff8",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout/same-https.downgrade.https.html": [
-   "e038c8edbaa6c3d86c82421cd99426756b00fd6d",
+   "1a25c627f12061a5aee359b33d43ec2a01c9f368",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint-import-data/cross-http-downgrade.downgrade.https.html": [
-   "367bedfb2e10bc81c9ce10d1b022d34ea32a30e6",
+   "67465fe1f122d799c156fc50a737bd12103e9929",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint-import-data/cross-http-downgrade.no-redirect.https.html": [
-   "45c8a2cbb42b3f7683c76d80ebd0d6b6dea3bd9f",
+   "63ed3803bcdad3869f63672408088b991702180d",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint-import-data/cross-https.downgrade.https.html": [
-   "8b3ad88a2c3d731f323cc26b42459ceac1c62ee3",
+   "dc5e9299fe17d51b2ae560dc0fa230c14b60beb6",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint-import-data/same-http-downgrade.downgrade.https.html": [
-   "9d9fe1d50de33ca65f8541da793d0d8801d91e4a",
+   "ae96afc66cf78696ddd93abd72a8c8b9cff85853",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint-import-data/same-http-downgrade.no-redirect.https.html": [
-   "d08ddfbd465bb1cac26bc723942e8f3d4ea1aeef",
+   "4389e79c1c5b0fd350c42c6d43b6a4ac2a26097a",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint-import-data/same-https.downgrade.https.html": [
-   "e9e26b1991fc3b47dded3945c1b62173d896dfa9",
+   "3f19963530baf7473b2908000e9d3c1c993dea7f",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint/cross-http-downgrade.downgrade.https.html": [
-   "37d16b63a4e05e4833b25dc7d7b5fc49dabd70b8",
+   "906fe3933425b47495dfaa0886605c87f11260db",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint/cross-http-downgrade.no-redirect.https.html": [
-   "3336529a41a884fb38c0b3d708d06b7d2a53e961",
+   "96b32dc3de2a40444922d58d6e67120e5e93b35a",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint/cross-https.downgrade.https.html": [
-   "35ffbd75717985efcb6529fa0114d9cff4456f8d",
+   "14064fdb072d298d9bfbbac0d5e273e128fbecbb",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint/same-http-downgrade.downgrade.https.html": [
-   "b92163e44e8a8ee9abdab660aba190bb430f8c1b",
+   "df5f7cf42edad9415698d3417d4904a04b772ed7",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint/same-http-downgrade.no-redirect.https.html": [
-   "bab2213df094c0fac96ca7d45f4be07f78e1b0da",
+   "47109c554b96efe5b1896ec09ef16b3358d501ce",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint/same-https.downgrade.https.html": [
-   "7a1e3f58291bc2d2a09d056f304b2765e0d89574",
+   "65990ae01308bc4cf3c04e81291d15be921ce08b",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/xhr/cross-http-downgrade.downgrade.https.html": [
-   "87f334e74460bedcaf94954ee74b08ec2fd6211f",
+   "e06f46e8ca9cdd127449fd3dec0bc1ae9c87b74d",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/xhr/cross-http-downgrade.no-redirect.https.html": [
-   "077f00c4ae29eb960ab991d9c3ba78fe003b00f4",
+   "c60709b78d19ce4e7c2901c0dd92cc0d873022f0",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/xhr/cross-https.downgrade.https.html": [
-   "112f3c086853411706b57836e17afb753c3a0c94",
+   "bec4fb99f463db960ac6ef515efe3a2e1265027f",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/xhr/same-http-downgrade.downgrade.https.html": [
-   "fa4303f50406f3ae61f23409ec1c36581da7b51c",
+   "8b48b85e967eade1272923dd56c339482b0d2e6e",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/xhr/same-http-downgrade.no-redirect.https.html": [
-   "066aae1b89898ba45ef31493dbca512103e467dc",
+   "aba565505133aebaff01270bb4196a6bab837ea6",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/xhr/same-https.downgrade.https.html": [
-   "7611729514162327a2ee0921a222992576c82514",
+   "78f91b196293f14fdf25ab5b3af0840a224564ca",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/fetch/cross-http-downgrade.downgrade.https.html": [
-   "4d815c09833630af9f69ad5df7c96f7e394f1317",
+   "a8c1f60a83a9f90cc82e9f837834d3ed9d3b0109",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/fetch/cross-http-downgrade.no-redirect.https.html": [
-   "cde4f053c8157c7ef3c5185117bed8824f48e53c",
+   "67931e2bcd454ed4ee667a58118d734972a2e96b",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/fetch/cross-https.downgrade.https.html": [
-   "3ef18070f9fb6dca5d381d7b05a040a3e1f97a7f",
+   "a420b76c468da6eef8666105601dac96f5bf89a3",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/fetch/same-http-downgrade.downgrade.https.html": [
-   "1162d570b1553497b9be0b7a9709b5376e5f4179",
+   "c017e8c22f11cf02a603109894f7a087e44b3870",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/fetch/same-http-downgrade.no-redirect.https.html": [
-   "a001d36f709cfddde630bcfb7ad535cc3ac5ca61",
+   "f288ec70431382e482067f9c3044195fa652522a",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/fetch/same-https.downgrade.https.html": [
-   "c120ee16693c564dfd70ad7a72d328da68c0100d",
+   "de6d8e06579d166ed2666377b9291f700b129e92",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/iframe-tag/cross-http-downgrade.downgrade.https.html": [
-   "ddc751483fe3e4bfb8ff2f422cb580cd9a05273d",
+   "a9385cd9d317939228c41069320d0c90f6c19309",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/iframe-tag/cross-http-downgrade.no-redirect.https.html": [
-   "f55db96fc32f2238b5fa4c9270726b59df139214",
+   "6cf723c0ef2cb35fd4f05b0d8ad51784bf7226d0",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/iframe-tag/cross-https.downgrade.https.html": [
-   "f16e2151ff5db3c17146e7885400c8412d6e15ba",
+   "597225f83ec37c82df30c8a01e422ad0a4ee00c8",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/iframe-tag/same-http-downgrade.downgrade.https.html": [
-   "461d81f9c3cff31823ad361e7ca19823985862dd",
+   "655557d39269607a21b12231653782de243bad83",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/iframe-tag/same-http-downgrade.no-redirect.https.html": [
-   "cfb5a665ba140632dfcbfbfd811225e886338afa",
+   "339e78b77c9a12698458ed2e9b23c55d7cf8d95a",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/iframe-tag/same-https.downgrade.https.html": [
-   "eef7cf479398ab2f16b609a1455b59484eb187b3",
+   "7b9a90f91c6dd7535c55e41f84a134f4ab811697",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/img-tag/cross-http-downgrade.downgrade.https.html": [
-   "4b45675dff208ab6e68898086981bc6ec8151d2e",
+   "e6ee8929e2c342507196c72faf871f95e0752897",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/img-tag/cross-http-downgrade.no-redirect.https.html": [
-   "1305ce818a0513469b4400226aa6ff090a9dccb6",
+   "c4018e7349a048ba8d178a66186910675665f318",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/img-tag/cross-https.downgrade.https.html": [
-   "eac2bbf8f731383570438fd81bba787fc4f89ee0",
+   "cafea33dc5f4735146f5a1ba2d2f18778d88f981",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/img-tag/same-http-downgrade.downgrade.https.html": [
-   "6a03e5715b04adbb579d6783c2a358f7452cc2a0",
+   "62b7157b24ce047eba89b2cee5e6bb1daf7d9a70",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/img-tag/same-http-downgrade.no-redirect.https.html": [
-   "2a38cb54683fa0d7721f92685385d3df408ee0f1",
+   "a8655a8818418057d8f5c661b3aec2650f64fe43",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/img-tag/same-https.downgrade.https.html": [
-   "9e3e1bf9cf14d4d1abf2842e08c8e1afd7af5fe1",
+   "2b2677ad0a73a97ee53a81578fb1eed5c5d57a74",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-classic/same-http-downgrade.downgrade.https.html": [
-   "884844f93a24e0e7a8126600737d646275ccec46",
+   "a63e0e90d250207a7a3a3af5ed839c2cae459a1b",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-classic/same-http-downgrade.no-redirect.https.html": [
-   "5f4ef1d07998c766c5f10da0f95ff60115e3c6ab",
+   "1bd43d712041b5b7ce0d5821dc409305da2bf3e3",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-classic/same-https.downgrade.https.html": [
-   "800de216b57cb2e0efeccddb580639df1fd775ac",
+   "d14816246a22f0145ded294f1f933496d0490a8e",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html": [
-   "ccbff1f2520de57ab8a3e5debdfd76c198d0aae9",
+   "a79e3c6d9339a5f6e5e7ec774d57592d3b7abbdf",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/websocket/same-ws-downgrade.no-redirect.https.html": [
-   "6fcd98373ee0407ae55eaffa278d361d61b5f776",
+   "7010694ed4affffd69dc7f5844cb2cf1d976ddb8",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-classic/same-http-downgrade.downgrade.https.html": [
-   "c033a44cd9bda5886fd136053631ce7291fc77ac",
+   "208365f8510344982a4290c933e4430ca8185859",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-classic/same-http-downgrade.no-redirect.https.html": [
-   "99cee0b279e4ce859b8845fd8a3a2cc47c85af7a",
+   "e5c4a1f9e01431748b7896ce1765b65a06643694",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-classic/same-https.downgrade.https.html": [
-   "b542ddc27a8d2e957ad0b6017d0d4332b5f21388",
+   "0c1aa11ea23f0dd7ac53c01fe0fa364e315feb55",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import-data/cross-http-downgrade.downgrade.https.html": [
-   "a11b956cfd54522ed66ea3f79c93ec21c546c89f",
+   "3f75dd6a3c80366a657fda18b59abfab47d2406a",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import-data/cross-http-downgrade.no-redirect.https.html": [
-   "0369b4d42431cf80e244826cf9510f4c9bc35e73",
+   "f10db8571246bae2b9b56d2ff744c02eb82d79e3",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import-data/cross-https.downgrade.https.html": [
-   "b10b8bc2c37f987b766dc0041ed8eebed3984db2",
+   "13138237f620f74aac5f6106140173ad8a2a979a",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import-data/same-http-downgrade.downgrade.https.html": [
-   "276c608c2d4c24967d7ca10395ea50239261f79e",
+   "b89ca84621effd9edb8beffa9e49f546bacde846",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import-data/same-http-downgrade.no-redirect.https.html": [
-   "a81788231131fbd1755883d7aa8462461caeebc1",
+   "3a6ef2d862b8a27ab6d55d0f1ed43da76e654e22",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import-data/same-https.downgrade.https.html": [
-   "1c88f0066f69154a71e39c677bd018c73f5b5486",
+   "93d0b56237881d0402fb0c06d02ba4df7221d410",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-module/same-http-downgrade.downgrade.https.html": [
-   "80299bba9f33cc74fe0fc9b6705bfa6b5ababaae",
+   "5a706ea7473caea1448496673cd9b519db6944aa",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-module/same-http-downgrade.no-redirect.https.html": [
-   "2d7a2070d3ba7fb50194bad9d7b89343df809d69",
+   "a52897c914bad58703911c07a660ff7341003b3e",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-module/same-https.downgrade.https.html": [
-   "a73e68bfb4eb5a52a3e590e610b9805d1c045b00",
+   "4ca4a56c8020e614f2874729ccb43f17868efe81",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation-import-data/cross-http-downgrade.downgrade.https.html": [
-   "f3b00d61d51fcbdf442acdeda4dd5b4b5a0dd936",
+   "773b363f4dee587338e1d98d67a07d54592d7e32",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation-import-data/cross-http-downgrade.no-redirect.https.html": [
-   "4b42be9e79b0061a1f44f0e6034a2d5d0c6ab90f",
+   "a4ef7937f147bfe26542cf577cbcd628e6517b5f",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation-import-data/cross-https.downgrade.https.html": [
-   "279fb691fd324691c78ec04e12095e67434fbdef",
+   "6ff75d0a694824b5ef0c3f7f63a1ce153e48ddd7",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation-import-data/same-http-downgrade.downgrade.https.html": [
-   "302bc0c2046cc57acd6ad1685ba518df9535e029",
+   "8a8a3ade1f08ac1e100ceca587ef57141239f7ae",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation-import-data/same-http-downgrade.no-redirect.https.html": [
-   "5f90729c0fc7bad1b21531f88fa19d63f5aa2403",
+   "3336b939181af9361958c62d5894488c218d0f10",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation-import-data/same-https.downgrade.https.html": [
-   "b639698b97423257e68e002b6f8ad43d0dac85a3",
+   "ef5059ee6c0e7dab5173c909e0d32ba141403dd4",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation/cross-http-downgrade.downgrade.https.html": [
-   "ce203e6d65c16d6428de605c389d31e4de8b7a68",
+   "c1b6b812fc89cd17bef6a6d30ec3df501bd411e0",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation/cross-http-downgrade.no-redirect.https.html": [
-   "efb198727fea7a1b1a71670247f8a7d651b7a7b9",
+   "eec4f30e3dd501900ec3e4c9742e5bd293537b29",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation/cross-https.downgrade.https.html": [
-   "6baa7f45ebfd7d7aeafc0b69763d7a04aff3848a",
+   "71a5f8e4be36e74f07594c9ca53f85f1c7c4d22e",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation/same-http-downgrade.downgrade.https.html": [
-   "439a7c9a226fc93aee7267282e5434a4055a8c7a",
+   "c9427314fd88ec236489d60cac2bb92911160778",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation/same-http-downgrade.no-redirect.https.html": [
-   "3fad5f1021d5d4213c755ded63e24b727ec5c339",
+   "57153200c44399ba9a9d9ca06fbe89b9322e9b96",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation/same-https.downgrade.https.html": [
-   "ff5bd878fdca5fd6ff9831959c35f8fc543c69d9",
+   "19fdd9e1602f0494c903082ca00200259e5959a3",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio-import-data/cross-http-downgrade.downgrade.https.html": [
-   "350f8a63f05f324f3c75db143693ac8ee946309d",
+   "6351a2aa8788169afff2568602dd682148bb925d",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio-import-data/cross-http-downgrade.no-redirect.https.html": [
-   "5662c12dbb875bbf87a7b50cf1c443aaa431fef6",
+   "53d044465fd25b9b2bc3cc54283ab87800a9dbec",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio-import-data/cross-https.downgrade.https.html": [
-   "5fb887f80eee93932e589da11e5da68804c1f3e5",
+   "af419ebf2eb952a725db1b5d17822da7eef0413a",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio-import-data/same-http-downgrade.downgrade.https.html": [
-   "36d14f7f5aa931449cabfdbe687444d400782983",
+   "383ef5351fc4237fc4f435a2d91365f69cabaf41",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio-import-data/same-http-downgrade.no-redirect.https.html": [
-   "35298ee1b8080f63a8015cca3904a582a4c7a9a9",
+   "7695e21ba997fa1cd4952504d6db350c1ae1a157",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio-import-data/same-https.downgrade.https.html": [
-   "ecc03d266e6e7e6c74034c051cd1c09deb5421f4",
+   "0ffaa8aea196f9798b12efe2630c1770a2080e51",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio/cross-http-downgrade.downgrade.https.html": [
-   "4dff0bf1b2d574ef16be178d5299cabf8b2a671e",
+   "2d3f37b088d30a7591c31a92ec438332325fe972",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio/cross-http-downgrade.no-redirect.https.html": [
-   "14206c8fd12f673ba7e06488029320f28f5563e4",
+   "0c11b8730982c264c73a4129e6e10d3cbf52ada6",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio/cross-https.downgrade.https.html": [
-   "82b7ecbea44639335de9518135064fc43f64d7ca",
+   "e8bd73f4fc29ecea489e910b0630d5e7da15cd8d",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio/same-http-downgrade.downgrade.https.html": [
-   "a5885baa2fc1c319c0facbfa37ac3be0120f2e1a",
+   "83bd891b009cab9cd9ddd47b34874907f2825c4c",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio/same-http-downgrade.no-redirect.https.html": [
-   "47337cdcb96487c12c7e298c81e3650108869211",
+   "9e71b60a6228aedbb6c1a59ba59d24d38742fbb4",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio/same-https.downgrade.https.html": [
-   "2a03d160571d03aa53eade692e58bff9216dc37f",
+   "207dc1bd292a144641c28a692f9fb6cf2e1f3eaf",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout-import-data/cross-http-downgrade.downgrade.https.html": [
-   "7fe5ae10f311b96803f9d5f47d5056b86a894daf",
+   "1fd1b65ac58a64e33741329274962234807e504f",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout-import-data/cross-http-downgrade.no-redirect.https.html": [
-   "b6b6e029df96f4c16f6fd6bd3b93999d5a8516df",
+   "7c3716a4bf9d67a38190afbff9f14c9782b68bcd",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout-import-data/cross-https.downgrade.https.html": [
-   "abd8f2624eacee52f93a739456cf38fbc1204f2f",
+   "ae72b58c8652b1218702fcfc8cb2e3e3f9c38b66",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout-import-data/same-http-downgrade.downgrade.https.html": [
-   "14bcb5f47e0bc5ff9b0258125fe98521d191bbfa",
+   "dcdbb6a7ada48fbdb5035d7a407f02a60c68bad7",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout-import-data/same-http-downgrade.no-redirect.https.html": [
-   "241ef9106892aff3d368326f9b025fdd7cb2c3a2",
+   "cabced3f61d6574075b3f27742878c02de9dfc45",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout-import-data/same-https.downgrade.https.html": [
-   "0b3ea13ad3475ff48e36986e209e88d6542ff182",
+   "5d42ff456cf334c49771e4846ecda6d8b97b0071",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout/cross-http-downgrade.downgrade.https.html": [
-   "01023441d822685be6808d6eb1c50c666a25d495",
+   "67c05c79922ca9976eed128ec3411627b9e7738f",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout/cross-http-downgrade.no-redirect.https.html": [
-   "ced106f8f2b57f64263d4283a661bd784152d85f",
+   "96d4cf807640b83ea7e14ea99f53da3b7711db43",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout/cross-https.downgrade.https.html": [
-   "96bb1c7fc337bb1eb8a33a8d384f46678a32730c",
+   "55dab1beb52d2f72dc7fe20c226074a4a2bf1b3f",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout/same-http-downgrade.downgrade.https.html": [
-   "d63911d54bf2dbd0b9b4cf4e8b49f62e396d7fd1",
+   "ebd45d92bb6841b676fae4613cda8a471119e858",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout/same-http-downgrade.no-redirect.https.html": [
-   "f7dd01186fee2167113668b240a32582b4be5e76",
+   "2790511c3c0b62a66605dddaa762ee143867b840",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout/same-https.downgrade.https.html": [
-   "072e5d3ca9652b1617049441440526817ad8c2b4",
+   "138f5e1a3bf594b1be8ab4f0d80e5bbedbed41cd",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint-import-data/cross-http-downgrade.downgrade.https.html": [
-   "89f861305c21df4fd31db7b757bd3571aa027d5c",
+   "2782ed171f2d8bc272ab04fb153660f28e5641e2",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint-import-data/cross-http-downgrade.no-redirect.https.html": [
-   "ded8c8320f801726a2cbe05258ebce8b832afc49",
+   "ac8b65a43143d8f36e963fc94732cdae3749c50d",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint-import-data/cross-https.downgrade.https.html": [
-   "7ebca39bec661f652aeb6ae7a262742e452aca97",
+   "a3760aa9f5d330cd6f5c30a1d6c5628934eaede5",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint-import-data/same-http-downgrade.downgrade.https.html": [
-   "266bb331dacf5e5e31c8c1e82b09ee721769f736",
+   "b59a96970ab66ad0471c430504403ba147760ad4",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint-import-data/same-http-downgrade.no-redirect.https.html": [
-   "2d2cbdc8056dc73ee7b5394d330a6f7f3e9892cc",
+   "ae1f7ca7603a501d73cdd79e72ff184be318e704",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint-import-data/same-https.downgrade.https.html": [
-   "b37b7ad7e49477b55e289cfb625b6391eeb97aea",
+   "b9bb91b94f24f777ddcc01ece26cfa00d0391698",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint/cross-http-downgrade.downgrade.https.html": [
-   "9e8c20c4d4a082d4937bda7e0f469ab0e5d5e14e",
+   "7857def8a13e8c4ff5eae44d9f77f2a2b2352c6f",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint/cross-http-downgrade.no-redirect.https.html": [
-   "cc521e77d5800d4df5c19045c2daac57b9a95c2f",
+   "996501e225e1611a97c369af457f69e2d7cdd1e9",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint/cross-https.downgrade.https.html": [
-   "59b4555e33c32f6c0542c0cdfaad3a0125795767",
+   "93fb65ff1e50f5831605623c997a73fcbdad3f38",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint/same-http-downgrade.downgrade.https.html": [
-   "e0a2a80419cb5fd1e518b8d18f98cc7f977b80f9",
+   "f5b4a996318115c39b82838f2bd0361be53d9269",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint/same-http-downgrade.no-redirect.https.html": [
-   "0c0fe5c37ce700a752c7a7faaab014932b99d140",
+   "f762298b16708cf1225275cde2e082fadbc3774d",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint/same-https.downgrade.https.html": [
-   "8d3ab709d9c4990e3c9b5a1bbbe486c1188531db",
+   "8855ee114079f0baf445e493f57cd293fef04682",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/xhr/cross-http-downgrade.downgrade.https.html": [
-   "4bbdbc0178c6fe63e8849c28f5c236f41bfd0a2d",
+   "415f306d80e21a29ee7050538afa08c2c7623c45",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/xhr/cross-http-downgrade.no-redirect.https.html": [
-   "e2c199e9eca36f8aaff8bf5bd76dde6f76d533ed",
+   "11b4f6cb0e4afbe4b36bccc0a4a2631bb4970f80",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/xhr/cross-https.downgrade.https.html": [
-   "614e6e837bfb4f403527ddf045b1f5851e27e52b",
+   "5528ff69ac49a78ae0c07d796f8cc8fa571d73fd",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/xhr/same-http-downgrade.downgrade.https.html": [
-   "ee3bfdaa7b042e80d7c7010b361ed513227f10c9",
+   "f677ac587f4a65fb0d899eede3fe313b82c5a2f0",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/xhr/same-http-downgrade.no-redirect.https.html": [
-   "969e0cfd7179de03bf6eb7d561875109fef6e99a",
+   "9ef3ddfda4fef475097db8436a4574c43cde4099",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/xhr/same-https.downgrade.https.html": [
-   "af181e9462c702f1f0cd257e48240f53ec9f6c61",
+   "ca46e296a44dec79c655635e9d921ac034afbc88",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/fetch/cross-http-downgrade.downgrade.https.html": [
-   "6f165b83c1cf829a82a7512054425d9548dabc44",
+   "29ad963e1f3c519365766afc9962f814599dc1a4",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/fetch/cross-http-downgrade.no-redirect.https.html": [
-   "c154ae6d42ac951b82cf447cbda5a210a56d413c",
+   "eadf65c44695df29f2882a4094e3eb292577fde4",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/fetch/cross-https.downgrade.https.html": [
-   "19cada4b11623bd52c865f2ad7b21810f0b14ef1",
+   "66e4fe89cd766bff0f05277522957f30539ec0ad",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/fetch/same-http-downgrade.downgrade.https.html": [
-   "7cfede294796f2355a3053493d0b8252aeaf2634",
+   "8e1384f04a4388e7f5d93b5faae4811a33992ab1",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/fetch/same-http-downgrade.no-redirect.https.html": [
-   "54a5e9a1cd2350e69d98a1db59776e563c16e41f",
+   "1db67f249f55d2e8192660a28f0577c053910269",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/fetch/same-https.downgrade.https.html": [
-   "9ec1a6777cc6825a602d58d797ec2f982ebbc4d5",
+   "d31e2c8365da14a4842821aab4a9426fffb18b5d",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/iframe-tag/cross-http-downgrade.downgrade.https.html": [
-   "9b4828ac45e1afd6b53a1c5fd2ce015bd259c369",
+   "bb4cd08752cae3111a784a9ac8eb7e1358006c14",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/iframe-tag/cross-http-downgrade.no-redirect.https.html": [
-   "f6342e1a26fe88ffde2290b62973783b593223da",
+   "931b55e77fa3f7bc45de92f673e11606f5c3f3c8",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/iframe-tag/cross-https.downgrade.https.html": [
-   "48966792c3b1d41827ab8b626e13e7a57ed83828",
+   "c1a84d11bee766e390b4e06502f75cea4a550722",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/iframe-tag/same-http-downgrade.downgrade.https.html": [
-   "efa9eba08e50de7759ea9b13ce1d2e34d8354be4",
+   "c5febd943792207aa7e1fd101ee65faea144c6ae",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/iframe-tag/same-http-downgrade.no-redirect.https.html": [
-   "2e78cec61ec2c322fb68b1ca5459d644bc41e2ed",
+   "4f2ac5ea1c338a6c10156b5b7fa9728c76f1c6fb",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/iframe-tag/same-https.downgrade.https.html": [
-   "7c3d637ad42ceb49dcecb3099370f77269c60e5a",
+   "5c4e84b3f646641697ed48e4c8d0d072f73d7370",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/img-tag/cross-http-downgrade.downgrade.https.html": [
-   "ec4bc932d80a421424cf08e601349f4ae00fe7e9",
+   "277181b5a30c11ad4c49c5ca70f90d1c03415d88",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/img-tag/cross-http-downgrade.no-redirect.https.html": [
-   "139b07bf21d1976f14495e3adbd1a14a08241637",
+   "7bc80458239e18814eb618d66c0413ea40783aae",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.downgrade.https.html": [
-   "0c325ea3f382782ee5d46d6e319da808b0ef9aeb",
+   "15b0068bab686d2e54f82e4b4d03c9f9151dff76",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/img-tag/same-http-downgrade.downgrade.https.html": [
-   "e82d1c11e8a695d0c7dbc39058f52b893cbd14b9",
+   "7536b0d1b4847e02b51f81c81323f793408057b0",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/img-tag/same-http-downgrade.no-redirect.https.html": [
-   "64ba3c24ca345db22868bb81659af0a749d27fc9",
+   "a4accfd9bb3b0e150f9fd4099318e862e99eef4a",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/img-tag/same-https.downgrade.https.html": [
-   "f7251e7b494c2b5a2e2484c4ea19e7689b7529f2",
+   "47d3a947047113787090375e0967bf7ebc7b1a8e",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/sharedworker-classic/same-http-downgrade.downgrade.https.html": [
-   "4eb31979ea6eb2664b7626a784eac58894a362f0",
+   "81817a9fc4df4bd4ef4b03e519aee265d5a1a2d6",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/sharedworker-classic/same-http-downgrade.no-redirect.https.html": [
-   "91eb40ea62fedb686ea8512dbd7b7993a1342698",
+   "4bb57dbc9a9fd9acec31459f799d6c850365e304",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/sharedworker-classic/same-https.downgrade.https.html": [
-   "36554b70c19c0225796135901364c7e85ebaacf3",
+   "5ed7f7b3afb92c92b23d01f06a8b3662da016faa",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/websocket/cross-ws-downgrade.no-redirect.https.html": [
-   "8212f346ccee8232c57c7d99eacaf8018521ba79",
+   "d4665f488e9eec0d8a5a7707899d63edde8ca2ee",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/websocket/same-ws-downgrade.no-redirect.https.html": [
-   "5cb9d5f2b66049c8ff7b78c51242e53a924a5cfa",
+   "c6390dc89ab2e10b538e919a1b0bd94a3848daab",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-classic/same-http-downgrade.downgrade.https.html": [
-   "7d6a1f9cd9e24a745b7e9567e83f10456da4dcb2",
+   "76410cfc8b9e30e287618844e5ef374f538c4bd3",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-classic/same-http-downgrade.no-redirect.https.html": [
-   "106ec53007d28f45b4a4f02c81a51768472463aa",
+   "9b13c7b2d146dafcf0e3a2571571dfb63bc06bab",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-classic/same-https.downgrade.https.html": [
-   "ca8c3d69cd0599322be1346e5fda020c4727ce4f",
+   "b8742944da1ba056b1c282210c52885924c6f55a",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import-data/cross-http-downgrade.downgrade.https.html": [
-   "dbd24d34e9be8c5d4488869d830cb2d78b1e037e",
+   "42e20249f6de0e61d4eadb701f9014cd75082192",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import-data/cross-http-downgrade.no-redirect.https.html": [
-   "6514b983f2fac9143bbe2f62b0026d82e2171e50",
+   "93639049818ec7d2f404276d5159115b9996a92d",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import-data/cross-https.downgrade.https.html": [
-   "18f496083f2879799471d52c45c103dc6fe46236",
+   "b738fa5ab225b06ecda8277df00a710af8290e34",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import-data/same-http-downgrade.downgrade.https.html": [
-   "0c16aff1991d9860dbcf94c84a5d6012de25af58",
+   "ce6ed5ea0c40c16b3d8b460e77e239343b35df10",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import-data/same-http-downgrade.no-redirect.https.html": [
-   "524b56d2ed339fdafb40a241f54b651e3acae565",
+   "a76b9859411de49d473573f8f1de9347aeaad89e",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import-data/same-https.downgrade.https.html": [
-   "c6339c9dd410544c992934763708bb9b73177577",
+   "5970537a1a0d77dcb10260e9ed4f447649faaf0e",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-module/same-http-downgrade.downgrade.https.html": [
-   "da5ea1a8a0f065d3fecebd196686a309f02e6ba2",
+   "e8d97f650daf40b7216acc14b208e6a511449587",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-module/same-http-downgrade.no-redirect.https.html": [
-   "3896037c69d092ccb4030c2d3f7a73ac2aba2d5b",
+   "257d4f593759883d62bc05688c3d821a0d749251",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-module/same-https.downgrade.https.html": [
-   "039baf92d1578f147134eb6307a45f367527600b",
+   "5f400ca041a10592554d6b93e52f35218075a69e",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation-import-data/cross-http-downgrade.downgrade.https.html": [
-   "0309cb0423094ee0cb090ba3e107bcfc0ee57794",
+   "2acfaba089ca7e44503575491c3e626549defb3c",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation-import-data/cross-http-downgrade.no-redirect.https.html": [
-   "2434b96497566b102408217964927c773fda9a22",
+   "40d119b13a68182401dc030eaa9d8fe813ab5623",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation-import-data/cross-https.downgrade.https.html": [
-   "ba6f77826a42637dcbe4fee78140f87e7913da10",
+   "0c691b43e29f4456f3c670b0713bc89dfe05865d",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation-import-data/same-http-downgrade.downgrade.https.html": [
-   "6ebeaa6dc838d14852fd65687e32efc645902eea",
+   "6cc28ebd6365f80fd1157e30d0593792ebc86f4c",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation-import-data/same-http-downgrade.no-redirect.https.html": [
-   "c1c863566d30248d81c29a61c3d0ff1ed5cc83e2",
+   "f34a8843b3e2771c78ed33932ff0388fbcbb5d3b",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation-import-data/same-https.downgrade.https.html": [
-   "9298d15d08a4c4a49680a3df2f50a247170f4c0b",
+   "63c32d16ccd6255ca0e2fa22a5280aecd8037c16",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation/cross-http-downgrade.downgrade.https.html": [
-   "a26939d28880fd7c79bc2251391a6660b53fedd7",
+   "ccab7434376ee8b68bd9bfc0c33902cec7f4ac35",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation/cross-http-downgrade.no-redirect.https.html": [
-   "2a4cf1e56d847e2a5e6b7e28f26d90aceee6827a",
+   "dd5a07aec5e43128bdf4bac67d2e11ddc4a4f846",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation/cross-https.downgrade.https.html": [
-   "154b6d0c812a84816a1db1f64cb4ca8dc6ce9546",
+   "c495e67f6613af55b053c48a84ff8133c6184235",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation/same-http-downgrade.downgrade.https.html": [
-   "bb1c98a99be815f7d1e7342e0d8dd89106bbecc0",
+   "85ab9af88cf66a22f8007f354fa37028f242bb65",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation/same-http-downgrade.no-redirect.https.html": [
-   "1c7729e0076b9c137dc907abdf451e335a04c899",
+   "f1ec2b850e4ef73f33ba7bbe4275610538438ba0",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation/same-https.downgrade.https.html": [
-   "9672cfacc0031f3f070e5584100542fc36e302b3",
+   "aa9280e316bbe7c608c991d231203b0700c336dd",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio-import-data/cross-http-downgrade.downgrade.https.html": [
-   "673dcb393ad3799f91925b37d0b080841e515d02",
+   "c043ed304e5dc0be4bef79d3d930b96e6000c06f",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio-import-data/cross-http-downgrade.no-redirect.https.html": [
-   "4ef84c7d605c2a681c2506b2a511846f0ebc5769",
+   "15e6ad289c89a809bd385c29b6236bd24e458ca1",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio-import-data/cross-https.downgrade.https.html": [
-   "6b6d8d918fe8b22330874054b284b9354ad8f732",
+   "a18b8f14766ffc92acf2f43113f51b6f431ebf19",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio-import-data/same-http-downgrade.downgrade.https.html": [
-   "c7e3806b3b7363209444fc63f38bc88496a1077f",
+   "2b5e6755761b88079ae8c1e2bbcb11a6544d8840",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio-import-data/same-http-downgrade.no-redirect.https.html": [
-   "e25c166085dfb12c803dba93e03473649fda60a9",
+   "e95acc2a761ba077289d026999bac1beffb06209",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio-import-data/same-https.downgrade.https.html": [
-   "911ba1494e6e95c288241ebd0ca78b755c8bb488",
+   "9e6eca74accdf4df0bff9fbf98ffc4445ba2f033",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio/cross-http-downgrade.downgrade.https.html": [
-   "e4362718a20e309e21c0290b16593bc904ad304c",
+   "c08cf7100f0b1f1a2866274f9b305843ce5c99ab",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio/cross-http-downgrade.no-redirect.https.html": [
-   "0248efb910f333573eb133b4cef3fad5d8039534",
+   "75478c090a8ca7936999fe7eca753f95b7753ca3",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio/cross-https.downgrade.https.html": [
-   "06194f2410e661cc17469fd1bfb817d92a186e3f",
+   "ffc0a7be048a0b4fd006e2790124227ec42892a0",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio/same-http-downgrade.downgrade.https.html": [
-   "bf9cada8a18a5e83c6c328a9c4f561d39371a16f",
+   "1243c576e16121610fc277a1552d3b2692b18f21",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio/same-http-downgrade.no-redirect.https.html": [
-   "413116bcf292b677b22f5e9dae0d3d7248055cc7",
+   "64632c6d76438bb8394909ac0aceb1d0e9e94abc",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio/same-https.downgrade.https.html": [
-   "c067eba190507df61d24c1b61d67b3544e9d4979",
+   "4afab488c32f348b14e8ed8d4cc09022dd71bf28",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout-import-data/cross-http-downgrade.downgrade.https.html": [
-   "141146d56419a58eb8f97d40fd32cec597c72803",
+   "b32fc7d38876e80848a6c2a2021cf94f7efb5d85",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout-import-data/cross-http-downgrade.no-redirect.https.html": [
-   "075d6d2e57e2efaf22eb197d550840ebc004feaf",
+   "5d335335b6cf4845ade9df0d6d65fa9b59301c28",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout-import-data/cross-https.downgrade.https.html": [
-   "5f93b90b63b91172974b7e35a9ec8059b70171c5",
+   "5409a86d169ca31bac6036784d7f345545ee6471",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout-import-data/same-http-downgrade.downgrade.https.html": [
-   "494acbeaa7b24f8dbdde7c85b40f0d7558eebfd6",
+   "640fc9ca2834d5a00af0375ac0d4150a78aa5282",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout-import-data/same-http-downgrade.no-redirect.https.html": [
-   "8342a27b190f984fe5113f7afca27d67db8f1b9b",
+   "715b1276c2deb362e172b555327a11abe6806b43",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout-import-data/same-https.downgrade.https.html": [
-   "de0e3f5c25ac4d7e811f1e7a5d648a2aeba5af03",
+   "cd0dbe2f23d4ffb97e601bcc94990a77875ccc34",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout/cross-http-downgrade.downgrade.https.html": [
-   "ca849d8bfe0dbb45add989c9128d5e26dd476766",
+   "747c02905876491b2a1a573c1d37e062b70c31a2",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout/cross-http-downgrade.no-redirect.https.html": [
-   "276e785e30fa0e51d121da641a473ce089bf0bd9",
+   "c85a6cb2447f045974499aad1a531f90af346b32",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout/cross-https.downgrade.https.html": [
-   "0cb383af95a497bf4e2cce8c821df0ef4e7a1d98",
+   "f45855c31331d19790a84343e695116d47887fdd",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout/same-http-downgrade.downgrade.https.html": [
-   "eb79935b7bfd3bc310fc966eac27e854ee091d04",
+   "3e5bcb4a777b2a74453d2507c1f307392a95bf85",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout/same-http-downgrade.no-redirect.https.html": [
-   "823e1f14a5f3e5d5efff1a5e2fbbad8502dd008e",
+   "08f7e751d1b8846a8b7cdbc0e5c4051bba8e0f30",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout/same-https.downgrade.https.html": [
-   "d28a67c7d86d5b336291106cbc799d08f5c25f26",
+   "886417f2fe6626052d75c4361a985c97be861540",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint-import-data/cross-http-downgrade.downgrade.https.html": [
-   "8afab24493852d495bfda27bdd09d26b22004fb4",
+   "cd96e54aaaca097e7276937a02f8270b46478740",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint-import-data/cross-http-downgrade.no-redirect.https.html": [
-   "95bfb178a3624c7406abadfdd84169ae32492af9",
+   "93e3b9b9565c0e63069769a45d838409b805cb98",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint-import-data/cross-https.downgrade.https.html": [
-   "c54e3fa73e7e9a094f020dd51ca056aa29886e14",
+   "debc2f8fb1a942bcf48469ca1a7e9c7607bbe9c2",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint-import-data/same-http-downgrade.downgrade.https.html": [
-   "0608f35a1e988dc68125560d91f684044cc33981",
+   "c1200df0a8c5c54a73982c483dae92b535753917",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint-import-data/same-http-downgrade.no-redirect.https.html": [
-   "6d1eaad35533de29f0eb495c20707c5253b4cba0",
+   "c9ab2def155a1e52b5c080950bdf895b076558c0",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint-import-data/same-https.downgrade.https.html": [
-   "31a8aecee617f290f3feafdcb92a835caa58fc71",
+   "24a3a5e232fecba382adfa7cfbeb99b565da6628",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint/cross-http-downgrade.downgrade.https.html": [
-   "dd9c10d27c6ea8df9428c90bb56f5fc84f80f07c",
+   "3a8af0180efc9f59e36ee1c5aa5fe3b2a08fa326",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint/cross-http-downgrade.no-redirect.https.html": [
-   "c7db718d84bdb320383d09b012bbc9c4f646d92a",
+   "b7f0a3d5c8da0b9498785520d30af66c1daa3520",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint/cross-https.downgrade.https.html": [
-   "d1f554ff94d67bb7dd07e2910132a0ac579344a9",
+   "2e79c3967f296908bca896a2d326a9ab0db85522",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint/same-http-downgrade.downgrade.https.html": [
-   "474b54b2a1267b8ab6e549293f648cd8859fbc3e",
+   "0978ef69233351d69bf585a35d64d64ea207b817",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint/same-http-downgrade.no-redirect.https.html": [
-   "a72e46f34b4616d4d45c12cc029b7a6ccf006382",
+   "335792e8e10e1fdf042689bdf22e866e14978541",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint/same-https.downgrade.https.html": [
-   "212288de464abdc783b3a3ba46c2629c842ca0f3",
+   "603fac3f6254128a58b422f6d0fb26bdd884daca",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/xhr/cross-http-downgrade.downgrade.https.html": [
-   "8647515e7e9067351459e968910e79611d5b9ff3",
+   "5383e837c256d34acb8b53d48dac3f4d3bd41b8f",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/xhr/cross-http-downgrade.no-redirect.https.html": [
-   "e1eb57b8a098bde074b4706129b3286c28331f15",
+   "c09e7ba15d79f0abce9b52ab60e2890c28045017",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/xhr/cross-https.downgrade.https.html": [
-   "bb110192d28ea919966d5cde49fd6f24529a88ce",
+   "64273879fd6d06adcd156c9b48f1c897aa2b6826",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/xhr/same-http-downgrade.downgrade.https.html": [
-   "8edb94b6b020c1b02b80ed10ea865923c7a9148a",
+   "2aec53e2c3ab721dd5703c0180fe86b0461d6106",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/xhr/same-http-downgrade.no-redirect.https.html": [
-   "38d91f2692827ae4488e4206c6ecde8b017eb5a0",
+   "4bcfa708a37b7e035676eb77bd1bd6082184373b",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/xhr/same-https.downgrade.https.html": [
-   "2bce883ad36dc6c346f7c9d4dddd12e0d59de66b",
+   "ccf34f0e811f4b5a30f88f38ff1f1f6c695fbeaa",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/fetch/cross-http-downgrade.downgrade.https.html": [
-   "a551418cb19cb8073e946508af4b848cd0087cab",
+   "aee9de0c82a4e5123864aecccccc731e06c44d73",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/fetch/cross-http-downgrade.no-redirect.https.html": [
-   "f4d9cc7fbf0c262db85a6712be760bbb61e19ac7",
+   "5bfb72d9578550ee21d8769b16c59be8c45dc779",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/fetch/cross-https.downgrade.https.html": [
-   "123b1eba94512c33fcdcc36111447bef62f71658",
+   "cbe415495a63f90b7a70cfefbe5336ee8cea99de",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/fetch/same-http-downgrade.downgrade.https.html": [
-   "c64f24573b6a20e32b1d21888d4ab5f145ddbb24",
+   "eeffa86cd6463da60b91001414ed3dc00435d2be",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/fetch/same-http-downgrade.no-redirect.https.html": [
-   "f9d119487b5fd7273adcd8a6f7389cec41538362",
+   "b2b97f9eb3107f80e5ebd86834d2ac4b9396b63a",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/fetch/same-https.downgrade.https.html": [
-   "5b132dd6996f876e21c2a0326e6b5b9a062f4a72",
+   "d1aed06207c7cae8865d93b105f5f4d87739fbe8",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/iframe-tag/cross-http-downgrade.downgrade.https.html": [
-   "6b0f777b0605aa10cc8d20025acda5315bcab24c",
+   "a6b861d8f3bc0cd6073b60f460ee8440bd75ca6c",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/iframe-tag/cross-http-downgrade.no-redirect.https.html": [
-   "fc07cfc37c74bae887387e28c78efef4529b1aa7",
+   "24b4b80b9012cee2a7fdfc30f031e86083e88411",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/iframe-tag/cross-https.downgrade.https.html": [
-   "06b2b8ee803815bc492161026ef368137fa5bf6f",
+   "2726b855e277a92a3a103e6c7abe4ab2e761c735",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/iframe-tag/same-http-downgrade.downgrade.https.html": [
-   "0c84e45c6b2cd9211cd05733bbe5549536f698fc",
+   "dcf7afefb6d899c3ddf842b29cda730f5fe0168d",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/iframe-tag/same-http-downgrade.no-redirect.https.html": [
-   "9430c55226ad0a790ef39b46ffab6f9ee336d5c6",
+   "5b1aeb953bfba0ce9e14305146e040921e893896",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/iframe-tag/same-https.downgrade.https.html": [
-   "5d78db1ea99c3d02a081fcadcbffaecaf30e9d51",
+   "baec695141297f260ba62b50df3b9c23da6fcc43",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/img-tag/cross-http-downgrade.downgrade.https.html": [
-   "818f0181b92f5543ae8ee99905e1cb2e6073da11",
+   "ebe5c7daec0ade609578fbd7dd12c863dfc850a5",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/img-tag/cross-http-downgrade.no-redirect.https.html": [
-   "3c5eb7fd4f9d26a0df18749f44eaea19fabe64e2",
+   "5df9e97602ca0783cdf8606a4b27c968f1d02233",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/img-tag/cross-https.downgrade.https.html": [
-   "d636efdc455b9c3fb9414e1a844a953947910336",
+   "b822e9311ac3b7f90247c0b8cee5fa9ae3f96045",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/img-tag/same-http-downgrade.downgrade.https.html": [
-   "24eb4fcdd9d4b343dbdb12a0c8921b7147c1b311",
+   "592789b68e2a14018b39746276a9d7eb7a36a172",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/img-tag/same-http-downgrade.no-redirect.https.html": [
-   "c71a1f235c1c7947a678914c2d020005d257747e",
+   "48ff84bd4f0da6017ae1f02248b2200159475c60",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/img-tag/same-https.downgrade.https.html": [
-   "1b200882673d1af8da64a5cd054da514fa018ca7",
+   "c31b823432c4445cf4e9fa8ea055b1e419be473c",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-classic/same-http-downgrade.downgrade.https.html": [
-   "24badc0b54b97e262e976f28f324ef0c518fd7d2",
+   "7c40b6bd618337fcd69364eefd7910c8d5f94d91",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-classic/same-http-downgrade.no-redirect.https.html": [
-   "3b90431dec4ad925739473d8502087fbc664ae7b",
+   "4ee70c5737ad3103cefa0704e07dbc13a200dcd9",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-classic/same-https.downgrade.https.html": [
-   "d8df110ca214c414975b702883f73148f97a882f",
+   "a37cf7b1c1201d342b9742c82d7430a67292d1d3",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html": [
-   "b1f5b39f02e0810623b57c6cf9ca69c422c8a6ca",
+   "75e6a885f59384392ea797209ca9cc72dcf601ac",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/websocket/same-ws-downgrade.no-redirect.https.html": [
-   "64e96fd5511c78139ced13b06798649d0dc7850a",
+   "25ada1128059ac138bdf99b7e389c2af7fbf7a0f",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-classic/same-http-downgrade.downgrade.https.html": [
-   "90368ada345f0ba341e68ba8af1612b6da194a71",
+   "80392491f00b07a9a1b891660827acd4798d05fb",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-classic/same-http-downgrade.no-redirect.https.html": [
-   "7155bcabc8331598023abf96bbad6a3f7a8900b3",
+   "ab26c04620d7602bf8036378d3285ee2ca4c6323",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-classic/same-https.downgrade.https.html": [
-   "1293e4bfdde01dc1e30360fbba069118b9840e90",
+   "c415822392c2c4618ac0f5250783dfed7dddaad3",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import-data/cross-http-downgrade.downgrade.https.html": [
-   "f045f76b74368cddf727b220f5c0e9aaabfde49e",
+   "9785dbe4357c6bd36f3a1b54447d085989e3a155",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import-data/cross-http-downgrade.no-redirect.https.html": [
-   "4e846317d2ff6966cbddddecc08c93be6981076b",
+   "c4676db028d3246c9d5421430a9a1b81caf960f5",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import-data/cross-https.downgrade.https.html": [
-   "c1c95cc4e2771561cde77a79277d37d33c51851c",
+   "fc590e7271abd907da11917fedeb36064c5369af",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import-data/same-http-downgrade.downgrade.https.html": [
-   "d9bcd0163ef0c8bd99957760e7926369e58f9c8b",
+   "d814072e41d04ffd5d7c4952247b942a67491d6c",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import-data/same-http-downgrade.no-redirect.https.html": [
-   "26eeefb54a1a55dd716e301786324ec45e439d8f",
+   "75cbf68253afbb004196e9a84a8964a19bcc8d30",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import-data/same-https.downgrade.https.html": [
-   "2208f8879c095b49647f4e208cbf246cd8394452",
+   "61b8125544f54ca44c6373ec90c02ae9eff55288",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-module/same-http-downgrade.downgrade.https.html": [
-   "6a09e8c9d3a8824735ce78304ac82ac5223dda35",
+   "a3a3783570e3f3ba3eab22ae646bf315ab4b6b68",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-module/same-http-downgrade.no-redirect.https.html": [
-   "c249771c7a14d8bf07ee4f8d269d9fd9229416e5",
+   "bb07520c8dda9f4d9b048655d834fb6db595b5cf",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-module/same-https.downgrade.https.html": [
-   "42b62af0edfd865bd73157596e4b303322bebcdf",
+   "77d6de88ecb4b4a4ec4cb4198fa1eb75b39f84d1",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation-import-data/cross-http-downgrade.downgrade.https.html": [
-   "90fe184c08f71d7c6644c13399c623bd0dd633b4",
+   "9682eb51719fd74a86a428994a9574e06f0ccd96",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation-import-data/cross-http-downgrade.no-redirect.https.html": [
-   "1288c7c6dc1e28c4342fc624945aa84752dd002c",
+   "9214bb2f77125f6efd85c513b739a03565ee82a4",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation-import-data/cross-https.downgrade.https.html": [
-   "07c27fec3ba4c8f2d41646193c17f251150eac57",
+   "799ba8f494834491f002448d3a7c5fb9dcd5b4ae",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation-import-data/same-http-downgrade.downgrade.https.html": [
-   "b7a12e0c4a6769637956973e1ff7ac70afed3b7c",
+   "c43defe6298ec761cb74c6cc2655449a43cd5226",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation-import-data/same-http-downgrade.no-redirect.https.html": [
-   "5f27dc4d9fd0a89b513f8bb3a5ea10fe73ad2715",
+   "1ef76ad7be2f08978c02ab1e8d67acc6363ee5a7",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation-import-data/same-https.downgrade.https.html": [
-   "a0fa92bdb1e273e2be4cbac3ae0af43b0e1b134f",
+   "f1d03735301b73a28d7f8cfe5463ce9d4dc37966",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation/cross-http-downgrade.downgrade.https.html": [
-   "fd35b79f023f705179575f746b49f45e66df70e3",
+   "e232edbac7c61253fd48cef043efa2aa845ce1bd",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation/cross-http-downgrade.no-redirect.https.html": [
-   "ee34404899eec609dcb2ea9e35373e23e6266fac",
+   "fb81b720d5a0e77087819a94e7dc90087632bf57",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation/cross-https.downgrade.https.html": [
-   "db38f1489becf7d0d0a9f492f0d43f31d3a4b59f",
+   "d74188cf455fe9294c200ce55279c1c2889fd08d",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation/same-http-downgrade.downgrade.https.html": [
-   "504cf09f3050f43765e7c5276dcc4fc3c6d7eb1a",
+   "50866e6e7ac4625149dcf6a2d4a72a6d96ddd0fb",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation/same-http-downgrade.no-redirect.https.html": [
-   "698a985ae2023e83f3169d3d1922a20229bbbe6f",
+   "1fb0f2e73e30378b69dc499d7e24ec2a02b42c37",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation/same-https.downgrade.https.html": [
-   "5d7e021e75f3f3ca15534837cdfbeae737aa60c1",
+   "d89c57becb612757ce7b91b011b0682a8d9174ea",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio-import-data/cross-http-downgrade.downgrade.https.html": [
-   "d3a6c681dca47d5093d2202cec95f56d08e840ac",
+   "17020aa225960eabf8a386032412747fd7a96e8b",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio-import-data/cross-http-downgrade.no-redirect.https.html": [
-   "f50e00ed5b178d4b9de334d4291834c6f71da8b7",
+   "cbe51e460e2bf7bdb6232f7d44c9c7cd371ba954",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio-import-data/cross-https.downgrade.https.html": [
-   "effd4a26783d1a1950acd40473f07d7edeeafafb",
+   "7cf4fb049b7ac53e584167ea4d8d4693a71d06f4",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio-import-data/same-http-downgrade.downgrade.https.html": [
-   "f19484bf012f92602ff79cbdc35d68c6929904fc",
+   "948b6bf341291a012fb09d5e683d992ba56740cb",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio-import-data/same-http-downgrade.no-redirect.https.html": [
-   "db00900d10180f2390f05f8a4e41c6212bed87c3",
+   "65ab28b25cac490b4fa257b626d3c5a0235c4e0a",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio-import-data/same-https.downgrade.https.html": [
-   "706e439d4e852a9fbdd1acc5e39616cc98c9fc2e",
+   "1b47c22bb30897b95b89ab5dbb43a12cea9ebe3f",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio/cross-http-downgrade.downgrade.https.html": [
-   "581cbcdf15a4fae4f7771cab1461986440fa722e",
+   "5b36e1ac061dbf24fe5d6831a08d0aafe9f9772a",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio/cross-http-downgrade.no-redirect.https.html": [
-   "1dfadd638284f8786d08ad8a0d4b2ff45172d8f3",
+   "d783f808f332d227c576343ab7cbee2e562f73e1",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio/cross-https.downgrade.https.html": [
-   "9f56262b0935be6b7f24678d86b9f45b4fbb8405",
+   "7b31f2af5a9a3771f1b24605e83c61b29a8c1dc8",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio/same-http-downgrade.downgrade.https.html": [
-   "bcfec764a3d43cc0af70de950a70f22a4ded20aa",
+   "f6c93b74547a80f198550cc4621cec92f0df6207",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio/same-http-downgrade.no-redirect.https.html": [
-   "71d5629dea534c06923d35a7296bcc43bed251e6",
+   "ff00362e9cd8e916163a75e7dcb32c2bd72f1bee",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio/same-https.downgrade.https.html": [
-   "ad67adad36f5454da534586ef5ff2fdbabbae6a0",
+   "f9069e28619d41eae1a5edb2b86f4a8ddc4b4336",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout-import-data/cross-http-downgrade.downgrade.https.html": [
-   "aa302dac6b640c9f3da909352b9e27d04e5a870a",
+   "94cd0ed19d6c61294af8c066d57ed9e286d3d789",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout-import-data/cross-http-downgrade.no-redirect.https.html": [
-   "f108bdabe5ec97a0772640e9458ba52797c32cc2",
+   "af924c382ddb5c57a80b13326fc028d842aebd79",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout-import-data/cross-https.downgrade.https.html": [
-   "6b05e643809ed236d5d4ef69fdea625327c05e8a",
+   "263d468633c1dfc69b5b98db424d1c4083b416dd",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout-import-data/same-http-downgrade.downgrade.https.html": [
-   "6b5418df7308b7eb2076a4a1af1ddb06fae4a765",
+   "bbd703b54ed6559ce84235982ce9a221fab1a7a2",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout-import-data/same-http-downgrade.no-redirect.https.html": [
-   "81c6958658c4fa45a31ee5a65eb716c7cbefb65c",
+   "505aaae581815971d79e845aebc5f6ae03b5b5f5",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout-import-data/same-https.downgrade.https.html": [
-   "29acc0eed4f1cb43b60a3263ac23b3389a60dbf5",
+   "b0d058b778ee260ca31f0dadf148d80e5f2c9b73",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout/cross-http-downgrade.downgrade.https.html": [
-   "7fe4009758cba3ddbb1fb4b5246d7e823f293517",
+   "7696a89d426a2e09e249e596eb103a4723d39e5c",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout/cross-http-downgrade.no-redirect.https.html": [
-   "0a03c48db64c75c052f5445b1d7952f816e33d98",
+   "822edf5b0948dcc3186a3d80c64cc586048a6b79",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout/cross-https.downgrade.https.html": [
-   "1d2c5933b51406a07a15bba8421f7e9c1bd41d0d",
+   "bb9c6023e6bd970ada89d530c6137370105243eb",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout/same-http-downgrade.downgrade.https.html": [
-   "b3ebc435c2d0c46e13b8f398c91a55255a21b0d7",
+   "c94b8ef959a45fef0326c50dddb5a8242c00f063",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout/same-http-downgrade.no-redirect.https.html": [
-   "26279c5fae242ba0f9a576973471c8df7cd17e4c",
+   "f51fdfba7d9d47164f2b9d381d42103c2eb2bd69",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout/same-https.downgrade.https.html": [
-   "5e1a4ec9decea9a567db6918bb962036dae1e0ef",
+   "4988c549b84b3d86c8e195536e8c328d724e0a87",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint-import-data/cross-http-downgrade.downgrade.https.html": [
-   "46cee9588407f3212ebf8fc5d4dde318a4e88f36",
+   "fee2bb271ea17f5bb55c7aa3b1d9150926f66e1c",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint-import-data/cross-http-downgrade.no-redirect.https.html": [
-   "b2b9bbd4b37a92d98ee7ffa9e957998f2620eb5c",
+   "4217fdd0bc03c97b27cf6ffd5385ca9d508b8f77",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint-import-data/cross-https.downgrade.https.html": [
-   "e5dd3eb356b55652b63bcb35050409b2ea5d8ba7",
+   "f5a48ff475ed85b673947ea745ce97b8d6229d40",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint-import-data/same-http-downgrade.downgrade.https.html": [
-   "6c642903995e29d9b8162da12543c142e9821997",
+   "4a42bb7f9c20b9f4ec3e20e3a8cabd9d5c1b27c5",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint-import-data/same-http-downgrade.no-redirect.https.html": [
-   "6ac8293bd6792536e499aa194139f8052d9e85cd",
+   "27363a5d1f2e2a2425b09aced0575166eff2e739",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint-import-data/same-https.downgrade.https.html": [
-   "f17b252ee7db4efde15e673da28a31fa0aeb87e9",
+   "a4f49c1931e866dd920eb85d95c6bdc1f70544dd",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint/cross-http-downgrade.downgrade.https.html": [
-   "1df14a9ea246e337e7ffd10558cd7587bbd9ba50",
+   "6e2e81afc48d6c985c22671ea3ce05a3b0a64c2c",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint/cross-http-downgrade.no-redirect.https.html": [
-   "b2f2dbb52b499c267d9b81fac097a491feb8376c",
+   "57c7ec608350ed62af70ee8e594c7cfb1696bbb8",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint/cross-https.downgrade.https.html": [
-   "189232b3f8811c8a489b16ef2903997c5de13863",
+   "f1100f235476a4a476420b4caa15334ec2832742",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint/same-http-downgrade.downgrade.https.html": [
-   "8adac34f0db683f48d0435c08d07c573fd5e1198",
+   "4cf1a67d41ee7cfdcff6c422393f8623651978d5",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint/same-http-downgrade.no-redirect.https.html": [
-   "91e1935963e2733d1fcbf22e7e7d86a47a1e0200",
+   "cfb87f8287ec390811f5ccaf56fed0067056dee1",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint/same-https.downgrade.https.html": [
-   "79dd7c52201b168abddacbc97e225f990264fd29",
+   "022a8c81867699ae5717d5767ef9e86b70234d49",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/xhr/cross-http-downgrade.downgrade.https.html": [
-   "15443fa2dd6abbddf1cda7eef7b5a5eb94a276e6",
+   "23a16e4af481b2e9c9139925381b11ff0cfa0265",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/xhr/cross-http-downgrade.no-redirect.https.html": [
-   "d72acbf8a8ab82aa54abe09879bfc8383eb7bbbf",
+   "a3300e50a11d625a0e69323e5b8caeda6a682b6b",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/xhr/cross-https.downgrade.https.html": [
-   "b22b35d9a37da906f1cb52a30be181445d22964c",
+   "7e3d77a836724a01703b96daa34c6a8950b44764",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/xhr/same-http-downgrade.downgrade.https.html": [
-   "e3a59677cb282039fe8e92572cfb3976c6d903d7",
+   "34fc7202332af52a4636321dd1771fb38d5389a7",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/xhr/same-http-downgrade.no-redirect.https.html": [
-   "dd4c6d887215e2d5f1a316b1554603ea3beb4f03",
+   "e0a92b68d0696cb2c6827f036b72558ddeb2ab6d",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/xhr/same-https.downgrade.https.html": [
-   "3068ecc85be92e8c94a50df43cbea669e6dcdcd6",
+   "5c88d569669ebc959fb702f5605e301f96db6b08",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/cross-http-downgrade.downgrade.https.html": [
-   "2a7790cc33ca7ad5018e15a774a7ebee1bbef419",
+   "6b2c0ad616cd549a5fd239ae19263970b895f5e5",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/cross-http-downgrade.downgrade.https.html.headers": [
@@ -722122,7 +721953,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/cross-http-downgrade.no-redirect.https.html": [
-   "6911881fcbf8517ef82779ba0dc450b0b75dae00",
+   "ec3c8b92c4c56014f25fe2e921fa7b93f4232989",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/cross-http-downgrade.no-redirect.https.html.headers": [
@@ -722130,7 +721961,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/cross-https.downgrade.https.html": [
-   "bf18d02efa61e780e759b2fa9c5cf069ce2efe0d",
+   "3a06038dc0f0cc8b371f733656282c0c091bebef",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/cross-https.downgrade.https.html.headers": [
@@ -722138,7 +721969,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/same-http-downgrade.downgrade.https.html": [
-   "5f031da8f22402c5bcac1159a3c21f199942ffd7",
+   "d9bca21935120a27e8512c29068480094d0fb2e8",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/same-http-downgrade.downgrade.https.html.headers": [
@@ -722146,7 +721977,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/same-http-downgrade.no-redirect.https.html": [
-   "63e6c10ba1c55448d9858ff9ad3e1a2c66d88724",
+   "2cb2510d985e7f1f7f1da2e06d4c386c76e8b4f5",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/same-http-downgrade.no-redirect.https.html.headers": [
@@ -722154,7 +721985,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/same-https.downgrade.https.html": [
-   "4769b3e47542b410ac79d5788f9a0cc32f1cc7d0",
+   "f138357a6fc1cde1750952905a7bb69536ede86b",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/same-https.downgrade.https.html.headers": [
@@ -722162,7 +721993,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/cross-http-downgrade.downgrade.https.html": [
-   "c8da091c47775dc853a7f9686703d95f16674b28",
+   "92b9a4015d6dc00018d1ab1df7248826cb7dc700",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/cross-http-downgrade.downgrade.https.html.headers": [
@@ -722170,7 +722001,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/cross-http-downgrade.no-redirect.https.html": [
-   "0ad59ebe503c97e338d1ca4cbf628ded76355602",
+   "c6117f3d772394dd9dcbba30a62769a297f73a56",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/cross-http-downgrade.no-redirect.https.html.headers": [
@@ -722178,7 +722009,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/cross-https.downgrade.https.html": [
-   "128fe831b5ddc05fbb9d33bacd85c3dfaa7590de",
+   "add0d38ec9cabea1d822b969e3c693091fcb1461",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/cross-https.downgrade.https.html.headers": [
@@ -722186,7 +722017,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/same-http-downgrade.downgrade.https.html": [
-   "d11fcf97344b09dcd7a0b80429f2f6425ed8751e",
+   "f6cbe1da0daa08114838ee957cfb55d42f6238f0",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/same-http-downgrade.downgrade.https.html.headers": [
@@ -722194,7 +722025,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/same-http-downgrade.no-redirect.https.html": [
-   "6032303cac0f6041def88611464039d685ac7c84",
+   "dd12ac231842252a70bb8d5b718195135bbffcb7",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/same-http-downgrade.no-redirect.https.html.headers": [
@@ -722202,7 +722033,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/same-https.downgrade.https.html": [
-   "661356c3c16cca32bc964266bc6a48318a8ac550",
+   "c4b777f0f33cc946863c7f56960ac91bb603a6b2",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/same-https.downgrade.https.html.headers": [
@@ -722210,7 +722041,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/cross-http-downgrade.downgrade.https.html": [
-   "c412844dad3b1114642132913659e7acd1e83552",
+   "9d71e02c9e37122e42060e7269c074cafe8e7302",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/cross-http-downgrade.downgrade.https.html.headers": [
@@ -722218,7 +722049,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/cross-http-downgrade.no-redirect.https.html": [
-   "fff93a9e18e7b10a88533281aac977758e1a96d1",
+   "809a31c35e3c357d06b5ce58def46c3d3e340c8f",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/cross-http-downgrade.no-redirect.https.html.headers": [
@@ -722226,7 +722057,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/cross-https.downgrade.https.html": [
-   "b63847a7cf039c4e018412670a4e54bca6b5ddc1",
+   "206d906c4f499da237ccd26ae075d212ad06446f",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/cross-https.downgrade.https.html.headers": [
@@ -722234,7 +722065,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/same-http-downgrade.downgrade.https.html": [
-   "5f53c2b0771183c9a5043b9715103074a06b5bd9",
+   "ec54a837fba13756b6483a0c258241d531e07478",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/same-http-downgrade.downgrade.https.html.headers": [
@@ -722242,7 +722073,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/same-http-downgrade.no-redirect.https.html": [
-   "0d890c4a5270b2dce5432d26ec7e31678a0af27e",
+   "668dbe9bd114d73a6a911d3b5bd7480ca461f748",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/same-http-downgrade.no-redirect.https.html.headers": [
@@ -722250,7 +722081,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/same-https.downgrade.https.html": [
-   "bfcb628c8021c380340ef57f726294c61401faf7",
+   "f5ecd77856d32a170419bd54b8109f581ecdf323",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/same-https.downgrade.https.html.headers": [
@@ -722258,7 +722089,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-classic/same-http-downgrade.downgrade.https.html": [
-   "9eccbf0123c0c89d6493ccd99a4fb232dfba20fa",
+   "ec03696469da255224779b29ffa0c2bebd37a3a6",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-classic/same-http-downgrade.downgrade.https.html.headers": [
@@ -722266,7 +722097,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-classic/same-http-downgrade.no-redirect.https.html": [
-   "8e5ea4a7fe9e4de5da59f4b759c7388f8bfa011d",
+   "4cee4e76d9a171446b027604238740f0e3bb032e",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-classic/same-http-downgrade.no-redirect.https.html.headers": [
@@ -722274,7 +722105,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-classic/same-https.downgrade.https.html": [
-   "470727e0625e415ff7a7f3ef9ecf7489fd322bc1",
+   "d4ddc305d1f81d6d50ff2d762c8a7187e2388966",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-classic/same-https.downgrade.https.html.headers": [
@@ -722282,7 +722113,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html": [
-   "4a52dfc8881fa4682c557ac8950107e6a91a0cfa",
+   "123a25f7fb7e7e8ef5c337ea061e1e6076c10171",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html.headers": [
@@ -722290,7 +722121,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/websocket/same-ws-downgrade.no-redirect.https.html": [
-   "805622a86d18695e512f4cb7d56ae126459de66c",
+   "a2a7b193e6d9a1142542b64e681be2a1bd642f76",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/websocket/same-ws-downgrade.no-redirect.https.html.headers": [
@@ -722298,7 +722129,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-classic/same-http-downgrade.downgrade.https.html": [
-   "71761b8b1df162aa01f006a5db50dd02bc782c33",
+   "793f743023b085f168dd39d4a31c0430e4f1b7ed",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-classic/same-http-downgrade.downgrade.https.html.headers": [
@@ -722306,7 +722137,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-classic/same-http-downgrade.no-redirect.https.html": [
-   "abd781bf1f4a7a9a1897fb9d656041ca371f2401",
+   "8a39a3b4c38888bcec409709e9291bd1639223b3",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-classic/same-http-downgrade.no-redirect.https.html.headers": [
@@ -722314,7 +722145,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-classic/same-https.downgrade.https.html": [
-   "514ea385237605b3d6e09db8cd55d39bfed7b5b2",
+   "2c4a4d25a7c2092c03e26c6e4278311aca278d6a",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-classic/same-https.downgrade.https.html.headers": [
@@ -722322,7 +722153,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data/cross-http-downgrade.downgrade.https.html": [
-   "3b56e7a799c3cb4f0a06daada79952c523200366",
+   "424b7595f94c7cf8f12e09b373cf9bafcc2bd97e",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data/cross-http-downgrade.downgrade.https.html.headers": [
@@ -722330,7 +722161,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data/cross-http-downgrade.no-redirect.https.html": [
-   "2d0474e03024e055594462b939ededeb03af887c",
+   "acc4563b1a9d8bbbb73f69e671d8315315de057f",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data/cross-http-downgrade.no-redirect.https.html.headers": [
@@ -722338,7 +722169,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data/cross-https.downgrade.https.html": [
-   "71353a3706bf87eae8803315a81bb41c00f856d3",
+   "3d2700d848ca32ccab9a2322f784f02feda4a8b6",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data/cross-https.downgrade.https.html.headers": [
@@ -722346,7 +722177,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data/same-http-downgrade.downgrade.https.html": [
-   "8490d9363fddc869321c713ef9041488e21b6742",
+   "d649c4a5c426b58e534213a982453f3217a47971",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data/same-http-downgrade.downgrade.https.html.headers": [
@@ -722354,7 +722185,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data/same-http-downgrade.no-redirect.https.html": [
-   "cf8591f88b1a320c62c61361602478b871333b45",
+   "88bba765402880601a60520d8bca40afa794d9c2",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data/same-http-downgrade.no-redirect.https.html.headers": [
@@ -722362,7 +722193,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data/same-https.downgrade.https.html": [
-   "9117f9435df42d3ab67099cf111487932f3dce57",
+   "a425a01af91c027ef14b595caed50ecbfceb217f",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data/same-https.downgrade.https.html.headers": [
@@ -722370,7 +722201,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-module/same-http-downgrade.downgrade.https.html": [
-   "f01a9c0f21893190eedb1cd337b119f184f60b9b",
+   "82fe96a308e4cd5af97e493d3ef190d3020fbfff",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-module/same-http-downgrade.downgrade.https.html.headers": [
@@ -722378,7 +722209,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-module/same-http-downgrade.no-redirect.https.html": [
-   "1f7b24ced6bce90ad88e17fdb363211e7f8cd43f",
+   "506eea2ff05ec2b7f23eecab9ace1350c1e82766",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-module/same-http-downgrade.no-redirect.https.html.headers": [
@@ -722386,7 +722217,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-module/same-https.downgrade.https.html": [
-   "4dda1d0f192363e9c223513c410f7c71aaaada82",
+   "3bc321922165a0a639b6d99bf442376b31ff2642",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-module/same-https.downgrade.https.html.headers": [
@@ -722394,7 +722225,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data/cross-http-downgrade.downgrade.https.html": [
-   "668bde7a1d5ce3eb174d6b1348516ad7e9fcaaf0",
+   "82c28b4a0c75df067b5509fa15ad9303e8401c92",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data/cross-http-downgrade.downgrade.https.html.headers": [
@@ -722402,7 +722233,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data/cross-http-downgrade.no-redirect.https.html": [
-   "6c94064853735a26ce09440d440a70fa039f2287",
+   "e372fb761a5d15645d61b82edbfbaae651bec754",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data/cross-http-downgrade.no-redirect.https.html.headers": [
@@ -722410,7 +722241,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data/cross-https.downgrade.https.html": [
-   "89a5aefe9113d4b0ce61d7b8e49ec7a47ff8e3b0",
+   "8b760745c7152cf9153c45b18bd24efb2a12abd2",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data/cross-https.downgrade.https.html.headers": [
@@ -722418,7 +722249,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data/same-http-downgrade.downgrade.https.html": [
-   "0cbf66c6db26456f145e3fa418dfa94fda205195",
+   "d970aff47f80f095a91a821b609b8035d245b937",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data/same-http-downgrade.downgrade.https.html.headers": [
@@ -722426,7 +722257,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data/same-http-downgrade.no-redirect.https.html": [
-   "6e4e8abe309a87f7ff1d6b844d577fb30a3f738c",
+   "6d4ae6a2e36dc0f027813580a7443f4fe62d42dd",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data/same-http-downgrade.no-redirect.https.html.headers": [
@@ -722434,7 +722265,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data/same-https.downgrade.https.html": [
-   "ab1f02af2069330c9db3092e586f643b86eecc31",
+   "ab61f3239a01da5ef4dc17225e39d074cb7b0fdc",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data/same-https.downgrade.https.html.headers": [
@@ -722442,7 +722273,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation/cross-http-downgrade.downgrade.https.html": [
-   "89607791547ec85d4e254305e76ac13a5c439fc9",
+   "23e397146ffe6a457b38e7a59db20769dc00b0c6",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation/cross-http-downgrade.downgrade.https.html.headers": [
@@ -722450,7 +722281,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation/cross-http-downgrade.no-redirect.https.html": [
-   "49b7df1ceb267d210a5d70af00b5aa1ec5a23cd8",
+   "4a763c292b5c5b194ddad16ae473d5e21bc5eeae",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation/cross-http-downgrade.no-redirect.https.html.headers": [
@@ -722458,7 +722289,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation/cross-https.downgrade.https.html": [
-   "8e4b92334351924400bb43abfd01fe9e8e9545d1",
+   "36794170c6a6d7312ae406c039da7746d11d4c0d",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation/cross-https.downgrade.https.html.headers": [
@@ -722466,7 +722297,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation/same-http-downgrade.downgrade.https.html": [
-   "d4a95355ffba66cbc6fa15d8674c588a1c566a70",
+   "5b7798cdfc70a313dbcf1d54db08dfa5ca41ed22",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation/same-http-downgrade.downgrade.https.html.headers": [
@@ -722474,7 +722305,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation/same-http-downgrade.no-redirect.https.html": [
-   "a8c88f4b10727bb74fae2cbd0f960173836b4f24",
+   "457f0ac8b5ef774df811d70410278752a9629094",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation/same-http-downgrade.no-redirect.https.html.headers": [
@@ -722482,7 +722313,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation/same-https.downgrade.https.html": [
-   "2f39bbb2fc580359f950ad1413440d47bd4a163b",
+   "6ca81ac3e9c6af1ede64960568704826f7b24e6b",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation/same-https.downgrade.https.html.headers": [
@@ -722490,7 +722321,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data/cross-http-downgrade.downgrade.https.html": [
-   "5f9500e2bcd9939cf98acf85a13bc9fbe3dbfd83",
+   "f64e2b5bd9fe17a6c4c6314b7e2e39dcc5777ee0",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data/cross-http-downgrade.downgrade.https.html.headers": [
@@ -722498,7 +722329,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data/cross-http-downgrade.no-redirect.https.html": [
-   "18cd96e8832001981413fa7edb050a15e945b837",
+   "7019e56dccb99305d00a971a3761f6a49b05b0bf",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data/cross-http-downgrade.no-redirect.https.html.headers": [
@@ -722506,7 +722337,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data/cross-https.downgrade.https.html": [
-   "ba6ed32a1d2341b01e7214b5f519bfe9a587ff9e",
+   "1db825e09f08fa10c45087ab03d85c22eb24e932",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data/cross-https.downgrade.https.html.headers": [
@@ -722514,7 +722345,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data/same-http-downgrade.downgrade.https.html": [
-   "309dd782e17a47239aa192ddeeda9850213bd4d9",
+   "bcb233b943b73d53afd2147ac85a03b94b79239e",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data/same-http-downgrade.downgrade.https.html.headers": [
@@ -722522,7 +722353,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data/same-http-downgrade.no-redirect.https.html": [
-   "12f598fce855942e9eeb48eda777db2256ba20a1",
+   "072dcf863ee7b3a17b12524885b9050804d1dc0f",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data/same-http-downgrade.no-redirect.https.html.headers": [
@@ -722530,7 +722361,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data/same-https.downgrade.https.html": [
-   "20c901c432625bdd92318c6ddda640e5f5e27df9",
+   "69c44ac6a58c3cb541b19faf1d6dc73a76f837e2",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data/same-https.downgrade.https.html.headers": [
@@ -722538,7 +722369,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio/cross-http-downgrade.downgrade.https.html": [
-   "9b59f0ae60aa9b7e6aebd561438e61ff29e42b8c",
+   "7dc69079e1d37f7cee9c696c1c99149a210af008",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio/cross-http-downgrade.downgrade.https.html.headers": [
@@ -722546,7 +722377,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio/cross-http-downgrade.no-redirect.https.html": [
-   "feae96d10e416e7d8b922b83f8671bcab30f87c0",
+   "64d386cbd439e4ff9ef7bf8a0a4c43a92fcf0641",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio/cross-http-downgrade.no-redirect.https.html.headers": [
@@ -722554,7 +722385,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio/cross-https.downgrade.https.html": [
-   "636ab9d72e3b688db663d463441a51d7934147b3",
+   "68069cec7cd2cea3caaf5e1fb10bc4a39d1ad5e1",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio/cross-https.downgrade.https.html.headers": [
@@ -722562,7 +722393,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio/same-http-downgrade.downgrade.https.html": [
-   "bff934a9e3d8ca564faf4047f780ed45dfc8128e",
+   "fe9618f929da5a31e30eb045221be91168027b28",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio/same-http-downgrade.downgrade.https.html.headers": [
@@ -722570,7 +722401,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio/same-http-downgrade.no-redirect.https.html": [
-   "3d8d86aa251fb4b524b36fd54b90f4a7b2282979",
+   "b8534b5b8092e41c06f7d63b0c0bf9790799b74b",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio/same-http-downgrade.no-redirect.https.html.headers": [
@@ -722578,7 +722409,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio/same-https.downgrade.https.html": [
-   "5d78867856ee79922d8449b9e2bf72f1089d2822",
+   "dfd4d450439f042659bd0d4f6659837c991a3395",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio/same-https.downgrade.https.html.headers": [
@@ -722586,7 +722417,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data/cross-http-downgrade.downgrade.https.html": [
-   "cb0d12cc92336fff0d7242d559b3781d1596c3f1",
+   "9737ddfc3213fa2ee29c9371ad6177d72a4ecc28",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data/cross-http-downgrade.downgrade.https.html.headers": [
@@ -722594,7 +722425,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data/cross-http-downgrade.no-redirect.https.html": [
-   "cddebab2984b930f4d4081983eb000c71d451098",
+   "86a314c5bf3e03afe8e57732123aa44b41cc4819",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data/cross-http-downgrade.no-redirect.https.html.headers": [
@@ -722602,7 +722433,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data/cross-https.downgrade.https.html": [
-   "e4bd2b688691e42a8a1cf08af29bde942f30126a",
+   "63fb7f3c94669ec305f9967328a146341cc238cb",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data/cross-https.downgrade.https.html.headers": [
@@ -722610,7 +722441,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data/same-http-downgrade.downgrade.https.html": [
-   "34daf23396b0d3315c24f3192fedc0f0ee3abf3e",
+   "edc14448cd0ac626aeb963e0d3cab7fb61004690",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data/same-http-downgrade.downgrade.https.html.headers": [
@@ -722618,7 +722449,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data/same-http-downgrade.no-redirect.https.html": [
-   "015697f4dcf5d3da22239befc2563f82c41f4f93",
+   "1322a7f4eea51f269b342e49d223fe26b04810e8",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data/same-http-downgrade.no-redirect.https.html.headers": [
@@ -722626,7 +722457,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data/same-https.downgrade.https.html": [
-   "f7fca4405ba71f0072758bf77ce6ec74b3d0b281",
+   "dce5c13dd49b9186738817b69b275fa280c198e7",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data/same-https.downgrade.https.html.headers": [
@@ -722634,7 +722465,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout/cross-http-downgrade.downgrade.https.html": [
-   "43617856af37bf5ac0cc6af332bee0ea8acc89cb",
+   "16d2f26ba93ff8bda969963216e457543411c4dc",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout/cross-http-downgrade.downgrade.https.html.headers": [
@@ -722642,7 +722473,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout/cross-http-downgrade.no-redirect.https.html": [
-   "9c4a6131428781161d1bd969fe3315b5f8c95f50",
+   "d2fca9c5f8375e20a4b708285466cdb3dc743730",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout/cross-http-downgrade.no-redirect.https.html.headers": [
@@ -722650,7 +722481,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout/cross-https.downgrade.https.html": [
-   "771fa29ebc5bf19abbaf5c80a45cb51ad7060728",
+   "d2643919d60b952a50d9d578cf53f0374d9c3f40",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout/cross-https.downgrade.https.html.headers": [
@@ -722658,7 +722489,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout/same-http-downgrade.downgrade.https.html": [
-   "6aa3f6295e9e5628ac4698e173640dc47cfb0025",
+   "f8033e597fb58ee3ef633db6e5218b512f481cb7",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout/same-http-downgrade.downgrade.https.html.headers": [
@@ -722666,7 +722497,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout/same-http-downgrade.no-redirect.https.html": [
-   "8190133d5936543c5b69e6f05a4ab7e4bd96b547",
+   "6cabd86707298993461821a5b17220faefe6ab41",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout/same-http-downgrade.no-redirect.https.html.headers": [
@@ -722674,7 +722505,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout/same-https.downgrade.https.html": [
-   "325174659007c50f9fcf52dfac51a5c7c6b864b2",
+   "6052e366992033350141b6b43140222079bbb737",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout/same-https.downgrade.https.html.headers": [
@@ -722682,7 +722513,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data/cross-http-downgrade.downgrade.https.html": [
-   "d7c86b06c825bf15b106dbf99a2b8b0c8bd03dd5",
+   "d7804cafa80425de985b8c4b10530f80eea76747",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data/cross-http-downgrade.downgrade.https.html.headers": [
@@ -722690,7 +722521,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data/cross-http-downgrade.no-redirect.https.html": [
-   "ca62ab79cae3364aedd9f885d2b44d986f285bc0",
+   "663004027ea764c8c3e3e906972d4574665665c0",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data/cross-http-downgrade.no-redirect.https.html.headers": [
@@ -722698,7 +722529,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data/cross-https.downgrade.https.html": [
-   "d2378fcadf01c74a8e2961dc1eedab438ec35bfe",
+   "3154f627a89010c8c810128d653ba61a566a2c4b",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data/cross-https.downgrade.https.html.headers": [
@@ -722706,7 +722537,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data/same-http-downgrade.downgrade.https.html": [
-   "74b9a4a54011e295893d1187a605b6e12a77cef7",
+   "f0a205fb9406534ec19c703c66fce07e7755e0fa",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data/same-http-downgrade.downgrade.https.html.headers": [
@@ -722714,7 +722545,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data/same-http-downgrade.no-redirect.https.html": [
-   "d94776fd03acd148745417dc13a833f4d53cc982",
+   "c7c2dee6bf384ea41bbe19884b0077b38a88fda2",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data/same-http-downgrade.no-redirect.https.html.headers": [
@@ -722722,7 +722553,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data/same-https.downgrade.https.html": [
-   "aa33297eaf35a4d60605da423f27b429c5872797",
+   "2ce9ec2fe366657dc98ba10b6cf91c40c447e350",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data/same-https.downgrade.https.html.headers": [
@@ -722730,7 +722561,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint/cross-http-downgrade.downgrade.https.html": [
-   "0619d470145850dd6b08942b906f55ae756eb71c",
+   "75c40dbd064328192b610e1374c46f595723836c",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint/cross-http-downgrade.downgrade.https.html.headers": [
@@ -722738,7 +722569,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint/cross-http-downgrade.no-redirect.https.html": [
-   "a91c13cfc8ef4068121de7cfdd926b35ce5a796e",
+   "d725217913d0ca85f7bafb342126208d1f5d3ba2",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint/cross-http-downgrade.no-redirect.https.html.headers": [
@@ -722746,7 +722577,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint/cross-https.downgrade.https.html": [
-   "a1d28922a80bf436f1cc0601c768e4018ceace99",
+   "88c53734886e2d033f6fa719b6b5288fdfe2f2e0",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint/cross-https.downgrade.https.html.headers": [
@@ -722754,7 +722585,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint/same-http-downgrade.downgrade.https.html": [
-   "56a8227d06493fe2989bb93368c7f5332b9f120e",
+   "ba6c4ce273f4d0c5ac7f23ed9815a39fdd90773b",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint/same-http-downgrade.downgrade.https.html.headers": [
@@ -722762,7 +722593,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint/same-http-downgrade.no-redirect.https.html": [
-   "6c551a59e493f360e6d3fb2ad69c34b056e8e330",
+   "92f5b1aac213f91558a46fe16c95f2688b481a73",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint/same-http-downgrade.no-redirect.https.html.headers": [
@@ -722770,7 +722601,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint/same-https.downgrade.https.html": [
-   "41d1547c5b0442798d62c2dcff84702a412d6f21",
+   "1aabb8d8df32137e6b925bc5fad1bd8c3893e808",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint/same-https.downgrade.https.html.headers": [
@@ -722778,7 +722609,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr/cross-http-downgrade.downgrade.https.html": [
-   "0278c5e72235050031604b47fd70a5b82dfce073",
+   "00ac29bc84e2b7786c2f57ff3bacfe2c7b9ba734",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr/cross-http-downgrade.downgrade.https.html.headers": [
@@ -722786,7 +722617,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr/cross-http-downgrade.no-redirect.https.html": [
-   "cdacbb0333861ab4597ac5546a24533f779735f1",
+   "a49ef623c533c750ac9ab6a370a9aaf1f80ee1f5",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr/cross-http-downgrade.no-redirect.https.html.headers": [
@@ -722794,7 +722625,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr/cross-https.downgrade.https.html": [
-   "711b035f9299a5b5db878f29889b2fcb8370630b",
+   "05bca54e30e78cbd6126a22b64b386052d891785",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr/cross-https.downgrade.https.html.headers": [
@@ -722802,7 +722633,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr/same-http-downgrade.downgrade.https.html": [
-   "c3f5fc83fd3031d7e87daada92451e04d073e9f0",
+   "471e943a3d08878f7761ef825bdc13bd43631034",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr/same-http-downgrade.downgrade.https.html.headers": [
@@ -722810,7 +722641,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr/same-http-downgrade.no-redirect.https.html": [
-   "234c639edfd27eec59963d6675024a211a2cf25c",
+   "7eb1ffb0c7935209a2c8c091c8096812e43b999c",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr/same-http-downgrade.no-redirect.https.html.headers": [
@@ -722818,7 +722649,7 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr/same-https.downgrade.https.html": [
-   "d926e88181caa40d1dab69b121226380a3edc7bf",
+   "269769f1806cc3e4c588e192aaf7f13897f3edac",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr/same-https.downgrade.https.html.headers": [
@@ -722826,831 +722657,831 @@
    "support"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/fetch/cross-http-downgrade.downgrade.https.html": [
-   "fca4a5a70a9711ab9d94064cbb4c80ba38564122",
+   "67efa81dc42733f1b76a1595fcb972b2b8192485",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/fetch/cross-http-downgrade.no-redirect.https.html": [
-   "25294d3272200a784d20c9535e1306da95241bc6",
+   "83500403a68c42805658b6615e0b0c5627e13d75",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/fetch/cross-https.downgrade.https.html": [
-   "5e8853d5e46106640f7ac2ca3e0adb432b76f107",
+   "87f89f3d19f8ef56b1bd3a9af694aabe28be03ec",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/fetch/same-http-downgrade.downgrade.https.html": [
-   "4518ced5dcbc9df299420471319e484870df2d73",
+   "8905e773525a14e3c417b95380f98c10a3dd61ee",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/fetch/same-http-downgrade.no-redirect.https.html": [
-   "2ad6b43f4473d82baef53ff290193bc5db47bac2",
+   "a5f2357d3557694067fe64355880af8d33b23f88",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/fetch/same-https.downgrade.https.html": [
-   "6ed6f53c9d5f8f8ef53e61d2b2e3bbb864762f29",
+   "f41f7cacb733c227a110ebc97fe3de653f555d52",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/iframe-tag/cross-http-downgrade.downgrade.https.html": [
-   "93dd9d9b7cadecef9838d626610ef6e0e40a5c96",
+   "2414d7ca26ca100864165d9540e53be7230da282",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/iframe-tag/cross-http-downgrade.no-redirect.https.html": [
-   "707c260eeecee5183bdb3e2b3ebaef0ccb2ae8d4",
+   "a9eb72807d31ecd3ec74f6859ca5702285fee90b",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/iframe-tag/cross-https.downgrade.https.html": [
-   "49a3a0d2c3f918351acfb0f36e830b3015609023",
+   "cb7616f7256724b14fa4f8b876ec3d4a3b7e7bde",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/iframe-tag/same-http-downgrade.downgrade.https.html": [
-   "7b308e355d04ccc743eeb532251576abff31456e",
+   "fa4310e3f14bf8d47b923150fe05f8c475731e09",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/iframe-tag/same-http-downgrade.no-redirect.https.html": [
-   "84afe5cf7bee536eaedc98e198af090ea9e3c6c7",
+   "58c4519da75fc4a86e1512069daa778335bd3176",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/iframe-tag/same-https.downgrade.https.html": [
-   "e00d307b5d13f7ffa276b364325c3496a9e3eb99",
+   "0168e00c65fe9aec39bde4e4fd30a05a27da2691",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/img-tag/cross-http-downgrade.downgrade.https.html": [
-   "8bcf5426b7096d5428ab380a2bb89dddc23292f5",
+   "2cb08cb8ccbdf691ff10a6167fed6eab27daca25",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/img-tag/cross-http-downgrade.no-redirect.https.html": [
-   "8ca7ccb653ebe1ab2d3b4cddae13a3ba2836d7a7",
+   "812df4cc1916bd93ab174096e5c69b9c4328628d",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/img-tag/cross-https.downgrade.https.html": [
-   "caaefaee6b41049f156f8e96dab956dbda4b40b3",
+   "c01c49587384a4b91657717370abfb711962ecfb",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/img-tag/same-http-downgrade.downgrade.https.html": [
-   "61aca5a259342cc2dad3d822887764143f15b972",
+   "c9adb7b61125ff8b1ea6ccca312f90fec2f00147",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/img-tag/same-http-downgrade.no-redirect.https.html": [
-   "3288cbe19daf2ab25fc5551f773ce109ea63d368",
+   "d1352fdf554da68a071724bb6de42b1faf47ea49",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/img-tag/same-https.downgrade.https.html": [
-   "3c0208cb48bb3b57b3dc72746aeaf4dd1fdea154",
+   "30b3efe54206c3b2fe9fe623f1a7f7cf27691e78",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/sharedworker-classic/same-http-downgrade.downgrade.https.html": [
-   "67ae9a77415a9db14482ceabe9392f26138ac273",
+   "071be8c6275af099c2a74944d41ce39ac9e2aaac",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/sharedworker-classic/same-http-downgrade.no-redirect.https.html": [
-   "71ca8334270f3cec78bc5c60c5e9cc993cfa1ac0",
+   "c7096af5ed880d5080e1079e70291997e914f36d",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/sharedworker-classic/same-https.downgrade.https.html": [
-   "88826a8d44095bb9e0f9eb0a95c58a2beac01bed",
+   "3a1d79eafaeb712eaefd291fb2be69bb48bdaf26",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/websocket/cross-ws-downgrade.no-redirect.https.html": [
-   "123bc13d5dbdb9792010ae2fe226121843ffaad7",
+   "77db067c64628c3b5828831ad9e3d380bc80b638",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/websocket/same-ws-downgrade.no-redirect.https.html": [
-   "a5bc2c88e7a642c073fc284ca32c57d55c634be3",
+   "ca033331e185a4e1c212622c4b618e1398d2c293",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worker-classic/same-http-downgrade.downgrade.https.html": [
-   "075e9d535dd0c612cecea236db06260b4c297f3a",
+   "34d1a7a784dff3ae64c7270bf20b88019b24d26b",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worker-classic/same-http-downgrade.no-redirect.https.html": [
-   "bec65611ee3b38a16aeb06a320509a26881f30c1",
+   "e4fc17ac1bd9fa0234232b94eb8d4650096ab314",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worker-classic/same-https.downgrade.https.html": [
-   "d9bb535dfc4d7d61742f35dbf088e1c202f5d699",
+   "8999ab8b9f7c05e64e24799124a9e0df3cd63d04",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worker-import-data/cross-http-downgrade.downgrade.https.html": [
-   "bf16f45e0ea3ae0625cc00c2dfc4bd272eed9a25",
+   "2c7b37e35002a3f2a23cb3e966cc283023af95e8",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worker-import-data/cross-http-downgrade.no-redirect.https.html": [
-   "23ad04062ed257bf3bfcb02de1db66c1e720a6d2",
+   "48f2589569104ab63c36cc89a19f34c5cb9eb901",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worker-import-data/cross-https.downgrade.https.html": [
-   "c10b93bca3fd28f1498f97fd8cfecd9eb9ab2313",
+   "9abef9b1ac94c9c264bfb7f53c28df067d68c2bd",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worker-import-data/same-http-downgrade.downgrade.https.html": [
-   "b40c22fb675d8c0c25d4d9bd7c6de099ce4b3bde",
+   "c36e94d5c6454129330057de0ffa5660eead14b2",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worker-import-data/same-http-downgrade.no-redirect.https.html": [
-   "c13ca3414b9576c4f0f0d70452f7c25fdd972502",
+   "a38c0dec0bb36cb7eafedab801a0dfc82372d209",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worker-import-data/same-https.downgrade.https.html": [
-   "e14ba510da1b74d2bc77417f454a953c9b5affbc",
+   "15bab9790467422c29bdd4db77c7d03806772439",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worker-module/same-http-downgrade.downgrade.https.html": [
-   "3f313441729ea9b78ce83bd24d6177164e12aad1",
+   "a5886371401c7244d7bf59d73f94ea57eecf77cc",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worker-module/same-http-downgrade.no-redirect.https.html": [
-   "fe106b20c74378beece550916f41f51e97cd9d01",
+   "3b773c72392862c63f926ba372bac80834524e82",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worker-module/same-https.downgrade.https.html": [
-   "0116fd8100eb4be377cafdcd6fc3223ee3bd8948",
+   "17a6e6cd2f141d2be2dc945ac1a8ac980fe1773a",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-animation-import-data/cross-http-downgrade.downgrade.https.html": [
-   "41db74a8800818b88117b478b18edfc128649d3c",
+   "aae618993c670b3f76b42fd25c25a7e245e610cc",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-animation-import-data/cross-http-downgrade.no-redirect.https.html": [
-   "48d95925fd064df819ca8f70808fa9a7fa43a0d2",
+   "022b2b2cc3d735e72059d4f599c7c78dfefa41dd",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-animation-import-data/cross-https.downgrade.https.html": [
-   "9d32ee17331d1e376250f63207768a35231c399f",
+   "7ebcd3afccd308fe7b97d1cfea2cc0b3db89735c",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-animation-import-data/same-http-downgrade.downgrade.https.html": [
-   "f16f22ced5867583b181086de2bd6d18b70be8fc",
+   "2209880dd9b50f674f0f39c3da8d1bb7f159c4de",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-animation-import-data/same-http-downgrade.no-redirect.https.html": [
-   "9933d1ddd488e00a2802d6ddaaa03386c58f89a4",
+   "9c3a668b588c2d4d88db6ca5cb684bbbca226a25",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-animation-import-data/same-https.downgrade.https.html": [
-   "097720482175286658e4d02e09c4527e9be0af51",
+   "503f0d99e50c11daa4fd462b7f03253198ac5cde",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-animation/cross-http-downgrade.downgrade.https.html": [
-   "5da525d932d8b2fd44e742f4f512615b3112cec1",
+   "402a59cfd69dc6ce9287e542b1848413cd04518f",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-animation/cross-http-downgrade.no-redirect.https.html": [
-   "3391cc8abf235c7fafe1a67e17a81a62f56128c4",
+   "518cbc31bf54f4fd860dc91cfb5968c4855bb7a1",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-animation/cross-https.downgrade.https.html": [
-   "dedd21701fdb7c03d7b908bd2d28830b52c863d1",
+   "bfd5206b0679de2271be3a9e282c901235644447",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-animation/same-http-downgrade.downgrade.https.html": [
-   "f07dad184a89a1e525fcfeaa15288252c7189376",
+   "88ea4837873d00a0b51e6425f784360d5cb60673",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-animation/same-http-downgrade.no-redirect.https.html": [
-   "61569fd8f8d63919eda299ede3ae6600575e0ee3",
+   "4a56f465125876c218308f3e053819030840a326",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-animation/same-https.downgrade.https.html": [
-   "ace49d00b97c5f9265f5dea83845917868df2d33",
+   "91e7912d5841c78227229ffdb3e92268c74e96c5",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-audio-import-data/cross-http-downgrade.downgrade.https.html": [
-   "c266298f0f8c4368b5177aee73631e545d0ce35e",
+   "20d573b29ca596e09f16401be23416d8500548b0",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-audio-import-data/cross-http-downgrade.no-redirect.https.html": [
-   "db6a1876b8c33e6546421711cf6da502313ced8a",
+   "a0925250e5e40462ecc3dc562b04e36824b7eb17",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-audio-import-data/cross-https.downgrade.https.html": [
-   "1e1a8faf7e7a5c6b665aafec0cbf49b1ec20e91c",
+   "1154b7166eaf2a61c8fa2315e80ae97ca9b65ce5",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-audio-import-data/same-http-downgrade.downgrade.https.html": [
-   "fec20a0914638a0e70eba9cdfc02f9aeb741519e",
+   "6910988ca2f35f0eebd6d472895416784376bfe7",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-audio-import-data/same-http-downgrade.no-redirect.https.html": [
-   "aef2b52cec3582e3e5dae065be2fe686c63b2084",
+   "efd4372812ba6e6d31a114b252c7ed75d4ac3e63",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-audio-import-data/same-https.downgrade.https.html": [
-   "d358584ba790b755b73f5741c9e4366f982954eb",
+   "1dc63d13cc63596861c01ad0d73adb2d73659471",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-audio/cross-http-downgrade.downgrade.https.html": [
-   "3a6e93dfd35c46f9321ef7575d2d812b5cb3fbbd",
+   "794f83b3569cf800f5d12c65afbd5c2bb8fc9c30",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-audio/cross-http-downgrade.no-redirect.https.html": [
-   "47fd0a407255812471c42c1bb673d4802f98628f",
+   "5d0d822a01afc0dbc2e43decc7f86cc64d736fb9",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-audio/cross-https.downgrade.https.html": [
-   "67a22edca431575199027481552aa843e31131a9",
+   "968b3f22edabdc1cdfe2b49d49eaf1552e257fb8",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-audio/same-http-downgrade.downgrade.https.html": [
-   "055606e7862da57b1ca3f8b814d7eafdcbecf303",
+   "d5a6774b4c55519e93d3c7ab416eadd2e9ad294e",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-audio/same-http-downgrade.no-redirect.https.html": [
-   "34f1d7985be9db4722c358be66f8ba8284bff061",
+   "a1772947a823e84fc8cf2589f0e23316d0bb6b35",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-audio/same-https.downgrade.https.html": [
-   "23707ba634e554244c7e22f3633551df0eb6b970",
+   "d4b582e442e2914f99e19792fa74dbbe4f53d9a8",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-layout-import-data/cross-http-downgrade.downgrade.https.html": [
-   "0b5cbe6fc7619936802f701870f2257c9dc8809b",
+   "e75284c16ab990d787af98188778df90bd73676c",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-layout-import-data/cross-http-downgrade.no-redirect.https.html": [
-   "7fa1f6e274cf2198b664a8061878341b8a1d2d01",
+   "2b6b0209938e15619b740e34ef265108933f25f5",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-layout-import-data/cross-https.downgrade.https.html": [
-   "40658efef370031b5c5236f586daedb79064709b",
+   "fa7ee4d91c4f501b894e08e6b0068bc549a3c707",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-layout-import-data/same-http-downgrade.downgrade.https.html": [
-   "5a66689189a34bea10a2ec50afe1fe4ece621cc6",
+   "367dd0492ac6d89398fea74b319f2f172610b4fc",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-layout-import-data/same-http-downgrade.no-redirect.https.html": [
-   "4b15e5512bb1845fa574f9c674e125f83083a80a",
+   "104a41a435777d2b426e1b62d7378d090341613d",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-layout-import-data/same-https.downgrade.https.html": [
-   "ca8c71f7a3be6dd85e3736d7bcf7f57a9ea9f373",
+   "110c4c25b191387ca180f0b60c7be3617969fce1",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-layout/cross-http-downgrade.downgrade.https.html": [
-   "6ee26e108d140004cdad2f5f534d4d64224436cd",
+   "9e8487938f00fb7edaae772ae6dff418b5230415",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-layout/cross-http-downgrade.no-redirect.https.html": [
-   "08ae852dad8ed394c6514fb48e6cd152e4d827a7",
+   "70762bc3cec1ccc063c4f8df5caadbaa385ba7ce",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-layout/cross-https.downgrade.https.html": [
-   "669fadbc9fb4c3e08bf24086be7632a2b3af3dc7",
+   "72244a8af0de33686d2f58a1670e7eebd82075ee",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-layout/same-http-downgrade.downgrade.https.html": [
-   "751ff7e4eda62427b66755534e4eb276df471e46",
+   "11a5abb8e4edc46675e7caee9b26315bcb366006",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-layout/same-http-downgrade.no-redirect.https.html": [
-   "3867169380d73dbbc80c37195f37b2be48bbbb6b",
+   "82326136f0d18aaacbd8a82fe9c8031a60db4d10",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-layout/same-https.downgrade.https.html": [
-   "6986a787434a36017ab198c252b243115386d74c",
+   "b8e2694cb775e3241d20ea703e6fa751d5376d80",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-paint-import-data/cross-http-downgrade.downgrade.https.html": [
-   "a29f6209b077237523fb8a9f077a6cc2963d160d",
+   "6f6c1f90cc5a32300a79e80603cc019c60a1ad3d",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-paint-import-data/cross-http-downgrade.no-redirect.https.html": [
-   "93383d5b6233f7349b3ee4d0b054ca847770d211",
+   "30aa9210970317e0b7d7de1e86aae27b47911796",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-paint-import-data/cross-https.downgrade.https.html": [
-   "346bb6b9fa3bdf77f8451d204d86a7a9a3a1e8bf",
+   "7cf00d3c786da155ae0f37f72de8cf0e1b698cdf",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-paint-import-data/same-http-downgrade.downgrade.https.html": [
-   "869fc00080d3e43927ec323f8712fa86d865715d",
+   "7e1946dcda5a0764118d44af011ae27f9e3cd92e",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-paint-import-data/same-http-downgrade.no-redirect.https.html": [
-   "542c18337a52afcc133779e0c0daf30a856478c8",
+   "663dc0fb4ae7f333d1be092d0cfae9722233b371",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-paint-import-data/same-https.downgrade.https.html": [
-   "eba63c36922811c69e7ab2265d2fdc58dd11090c",
+   "0b4765bc2ac18efd7e0535f04a8f9ae6db67769c",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-paint/cross-http-downgrade.downgrade.https.html": [
-   "1dc5f081122a261fedbbfb210d0d0841c23dd05d",
+   "41cb8a69766655328301e2606a97337fea5bb3d5",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-paint/cross-http-downgrade.no-redirect.https.html": [
-   "01a84d602d4f34b645e9c708b9645968cbf3cccd",
+   "083429832810358104b6c8071dc1a4660cd19f27",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-paint/cross-https.downgrade.https.html": [
-   "8589ff6bc2df14613fb62a67ebdf8b915be70713",
+   "b1bb99468ec79d10e8f62dec91463c433cfcf922",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-paint/same-http-downgrade.downgrade.https.html": [
-   "30314fc606d89f5b58b91157699dc65893c39037",
+   "e3502179c9c5d23394175cb56f538e972cd8fbee",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-paint/same-http-downgrade.no-redirect.https.html": [
-   "daa420b357fff6bdb06ea4ab918bb6f333fc4b39",
+   "df54f05e0b0a9f1eee292249179a41f1e612c39c",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/worklet-paint/same-https.downgrade.https.html": [
-   "383f42ed9127bdaea0afcc01cb352b72aa690dd6",
+   "5e8dc0759fbbbcbc10012f9f040a5cad8e3dcb91",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/xhr/cross-http-downgrade.downgrade.https.html": [
-   "beae338c5621a87e4c9063158803a7f494083e74",
+   "98f66961c1807950c53b5e6f8f5e457dd1950c05",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/xhr/cross-http-downgrade.no-redirect.https.html": [
-   "685ebe401009c30a372c2c1f70b1df66c1a6cfa1",
+   "a9955b4f9cb72d7e0ec0a11493c157252183604c",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/xhr/cross-https.downgrade.https.html": [
-   "4bbfd75744a1e7d70ec6d3d30ed82a050caf3c87",
+   "506b71efff01fbf7f9a09f6d804bbf955d10cfa0",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/xhr/same-http-downgrade.downgrade.https.html": [
-   "cb5cc3a476f7abf0bed9c2b0de5238b680642ad2",
+   "1ef6a56d3eb5c5557544bb129b7eec7211e33b68",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/xhr/same-http-downgrade.no-redirect.https.html": [
-   "a5325b32569020ba37f4f549de45733f3d06ee46",
+   "b57e26b855f2803cf28c59b07793ea8841f8463d",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/unset/xhr/same-https.downgrade.https.html": [
-   "cfe86148a2533d2056d85a46e8b7937f4608f787",
+   "8758bd12df940e860404ff51f19fb1a9ddefbd75",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/fetch/cross-http-downgrade.downgrade.https.html": [
-   "f9750e1a3721c5b58548eae9fa495c7087f0dd7e",
+   "2138d47f98130fa7cd701fb5f087cf5e0392a104",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/fetch/cross-http-downgrade.no-redirect.https.html": [
-   "3b08b721e8707e5ee512a33e48aa29ff74e26d33",
+   "0549df7f3bb4f6ce72bc6acc875dc37bf894bdad",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/fetch/cross-https.downgrade.https.html": [
-   "8d0a80ab817abbdcf886cea79ad0088e9fedc2f0",
+   "2756e62b48229e5bf179a75a0c05bf657a2ab3f9",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/fetch/same-http-downgrade.downgrade.https.html": [
-   "d5ebb857f6aa45327a73ced6cd140592c946a77f",
+   "9ecd3eda7d1b36cd3774b1dcc98d5ca9cb7243fd",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/fetch/same-http-downgrade.no-redirect.https.html": [
-   "5d6d8f5c4e5efef0b3b17947fe63921d845b5999",
+   "6339cb769b9c119aae2e2593699810b52efe4cc6",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/fetch/same-https.downgrade.https.html": [
-   "63b5c8c505ac81f409a25ed56cbc68d4a28b1737",
+   "c36c0d188eb9915416656754a0ae18bd96d61e8a",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/iframe-tag/cross-http-downgrade.downgrade.https.html": [
-   "09be76409e4b15e6d223f83d201f9737c4637d21",
+   "1dd755c5514a4ad90818922712551fde8bda0b3b",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/iframe-tag/cross-http-downgrade.no-redirect.https.html": [
-   "e86f7531ad540d2ae68aa19c7871cd09a413b9c1",
+   "ab3f5a2e5694b5f77453ce7862d45cd47909635c",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/iframe-tag/cross-https.downgrade.https.html": [
-   "4f2e231419fb1853e860c526a7a6d55a9344c9ac",
+   "a9c65e84fbbdce49490d249e4e231f7a9ed60a7d",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/iframe-tag/same-http-downgrade.downgrade.https.html": [
-   "86958e9db78e5e4c85b2c895890e28328a03b026",
+   "d4546625679ef360ae9dd191f93ef3bd274b32a6",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/iframe-tag/same-http-downgrade.no-redirect.https.html": [
-   "70507d39d8d8e13ac5e5f3cc787d151ae8ad466b",
+   "79ab70738c0b4002a7af7d58a9a3fa7a6f76fb10",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/iframe-tag/same-https.downgrade.https.html": [
-   "71764a1f149fff7489b90b700644cdfd8125b605",
+   "b0cfe5bbff341ecbe1a32cbd305a71f4e4f513cc",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/img-tag/cross-http-downgrade.downgrade.https.html": [
-   "c0c141a692b0d66fe01b1ce926d1d2b4158a5699",
+   "aa674cadd345ec9962df94670024620966efaafe",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/img-tag/cross-http-downgrade.no-redirect.https.html": [
-   "baef52df2fb8596e1cd552117c27208202376a94",
+   "16e6ac52c3691cf56c2b419ddae10b132d1e0aff",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/img-tag/cross-https.downgrade.https.html": [
-   "25f2948fe78fa85e89f37c4cf98e9c5f36c6cc10",
+   "9eedc83dbb1c38dc6d933504c96e827bf23c4c72",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/img-tag/same-http-downgrade.downgrade.https.html": [
-   "ab649803004b8e7cb1669643cc0e641fa2183967",
+   "66f477d68a7662f472e2052bd0395d53d67f9b3d",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/img-tag/same-http-downgrade.no-redirect.https.html": [
-   "066d34cfe73dde9c932ba42a65d8a973ba195216",
+   "bb832d5d4263a7781e19af3667b8ae87e1ba0cb0",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/img-tag/same-https.downgrade.https.html": [
-   "073a0ae880d9447b9d86789f574cc5fe661b0687",
+   "87a03bb78450e5a3b127d628027db50af6e9af4d",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/sharedworker-classic/same-http-downgrade.downgrade.https.html": [
-   "00cd0d4698c51ff2a59f9e4449b5fab7e69a7155",
+   "190e37fe257244832eab28324ceb34b972f59ceb",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/sharedworker-classic/same-http-downgrade.no-redirect.https.html": [
-   "5d0e23e6c1b1086aeadeb49a6ba5b59c5abb4b72",
+   "78b431bf6ed98f28fb14c45528e76875eefa0fcf",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/sharedworker-classic/same-https.downgrade.https.html": [
-   "08bf866c4dff7d457bbb8b4d2c8e1ed89fcee662",
+   "22fffb7e65d66e310fcd3d708ffd6f0cc7726f38",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html": [
-   "8858a097638df262be702cf7c5cd2bdbd110fe99",
+   "65f84d20c67b9121c68d6f3fcf39aee8d9ec5473",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/websocket/same-ws-downgrade.no-redirect.https.html": [
-   "dfebfd1e5f5037e333c0d91f017768df99df2091",
+   "dd559d15752d9d47159a96115dc275add0b67f4d",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worker-classic/same-http-downgrade.downgrade.https.html": [
-   "344837e8b2fe3d85aba9b81b977493b47ff786ef",
+   "a460071f0803d861796be01e8005b7592d2e1c3a",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worker-classic/same-http-downgrade.no-redirect.https.html": [
-   "cf36e0183b8a6401644da3bed4acbca61074e038",
+   "26fe5b4e68a00ecd2edb18a179c320e8c828000f",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worker-classic/same-https.downgrade.https.html": [
-   "7b863f63d8bde038858169e2d1285bbe30a09543",
+   "fef4c2b34ceccf220e8de95ad442736c640fd531",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worker-import-data/cross-http-downgrade.downgrade.https.html": [
-   "52c9277442ad13019fc9520928417637e0fabff6",
+   "03d1b998705cd555cf6cb7a41b8cf7c013da55be",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worker-import-data/cross-http-downgrade.no-redirect.https.html": [
-   "81a16de6a243a8692aef716a6aaa6b57de82915e",
+   "ff5f284a7426d1b97149d8dc46f7121a3bd8b36a",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worker-import-data/cross-https.downgrade.https.html": [
-   "94ffe6cc32b2b3176d763a068dada8ba73fa2926",
+   "cf8c9f48598d253eb97fd5d0fbe24a67beeb6a26",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worker-import-data/same-http-downgrade.downgrade.https.html": [
-   "c83cb3af929dbbb41dd86b410cd0fb996a15c911",
+   "04a459cbc21bd13effb32e15bbbc41214f7328c7",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worker-import-data/same-http-downgrade.no-redirect.https.html": [
-   "26eb2051ee3bfeca2321ea4803d7148ff0ed2f02",
+   "152ae93b54e80a9979cf305343502fe334ae349d",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worker-import-data/same-https.downgrade.https.html": [
-   "18316c62cfe70a609689abba0a3eaa6804c4e220",
+   "23ebc58fa512d18abf8bd78662cdb8a664bff34a",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worker-module/same-http-downgrade.downgrade.https.html": [
-   "e86ab02cd87878e0ade286fce3535de7d049e451",
+   "24fbc562fbd0dc1784d2a25763b30d1ec8081ea2",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worker-module/same-http-downgrade.no-redirect.https.html": [
-   "d671b9d4c33e072a75822f856657f9859168468e",
+   "d65b8ec7e79a90e0468024b5265c178b79e7f699",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worker-module/same-https.downgrade.https.html": [
-   "7441428075fa4549b62f9f55958303ba94f7a65c",
+   "17c17fa82b0f71e7aa0c1d82a3932bd70fdc496a",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation-import-data/cross-http-downgrade.downgrade.https.html": [
-   "b81d616b9c7583eced1598e3e67be7dc9259e81e",
+   "537db7e735a7d015aa930f280469d6e97a73131d",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation-import-data/cross-http-downgrade.no-redirect.https.html": [
-   "e24be56b7beb34e282ee9a6bdb476c3bc69806b4",
+   "63242d0a0bef04e03c8355ee2fdabfcba26b426c",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation-import-data/cross-https.downgrade.https.html": [
-   "5783bb8986dbb4394e9e2e2e332bda799bcf82b7",
+   "eafb6c1e2dd66496f1e1947ac5b1f3fa3b057b01",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation-import-data/same-http-downgrade.downgrade.https.html": [
-   "fad7c7c68a1ebe08d7141638467c04eef3d3288b",
+   "033297a088e863e99fafb5de79ae86823e6c9a0a",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation-import-data/same-http-downgrade.no-redirect.https.html": [
-   "fb7fa4d863955e086fd2ef304391e5acea171258",
+   "468ec100c7b03c0790c557a8930a7e6d5da47688",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation-import-data/same-https.downgrade.https.html": [
-   "6c340d99ddde630f1f7ce324497e13771ff23a6a",
+   "007d9ad0e09477fad19b5e19d1230158b7f18b95",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation/cross-http-downgrade.downgrade.https.html": [
-   "e01c62a2781a2ba295d3a44e40a3b5ac04e1ad08",
+   "2aa5e96edb81ea27931e76990c083b31c74406b0",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation/cross-http-downgrade.no-redirect.https.html": [
-   "35507477de1d45b8bd1da278d851bda5f3e984ac",
+   "2841b991bbdd466e379887a40c9a6934a3357f0f",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation/cross-https.downgrade.https.html": [
-   "ca0d0e6a08f991c50174a479826a4d57ee4a0658",
+   "b8fcfc4e14e587de3bace2d0e566c5edeba55f2e",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation/same-http-downgrade.downgrade.https.html": [
-   "49557f2c613643302f769f55025f1f1a9e171c7f",
+   "3aea026d8119667595b8d7774f54d0658e7adb93",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation/same-http-downgrade.no-redirect.https.html": [
-   "3fd3641af409c717772f4b5c015cd000af2b7566",
+   "a6a1a5d3c9bfeec09d42ceb77e0ce3afc5a07e58",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation/same-https.downgrade.https.html": [
-   "02b1038cedba80d18b530729ba81fde5a7d21ea1",
+   "f84d2eb2000a88053a6b957e660ba1bb390d4e8b",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio-import-data/cross-http-downgrade.downgrade.https.html": [
-   "8c17faf68aff257bb9bb78079a8fa897f0f947d1",
+   "de18eee7b13643247a2d2b7c4db05d22e0b8f772",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio-import-data/cross-http-downgrade.no-redirect.https.html": [
-   "415ca3d7476d9a9262a38bc4c1f97eceaebefe65",
+   "a6d61ca4c8039a7243090ae9d1be1bca8ab0cbc0",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio-import-data/cross-https.downgrade.https.html": [
-   "d36faebf09faa680021e2e51a9991e02e73bedea",
+   "078155b576f4451b2a335b6bc8c28eb5c7b878b1",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio-import-data/same-http-downgrade.downgrade.https.html": [
-   "329b41e2c207df5219046d345f15589020f07176",
+   "3f3cc5734753c3791d86f71ff0f82cce0ce794ec",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio-import-data/same-http-downgrade.no-redirect.https.html": [
-   "09f9a35167ee8f619ee6dc4bb647c1849dca6946",
+   "5ffee9e3fd017972e67f282903d0623d6fb0095a",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio-import-data/same-https.downgrade.https.html": [
-   "5face3b0f1ad5e222816286246b986f24dd5c6b9",
+   "aac6bdce7766481f779f1b1e07893c6ad7363635",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio/cross-http-downgrade.downgrade.https.html": [
-   "5ca6b71935ac677ec4eccb34100ad4d899dd0b38",
+   "6e3b86a24a7a6e9e21a290c79199a224c85e67a2",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio/cross-http-downgrade.no-redirect.https.html": [
-   "9addf82ae1278333797ee2a54e27d653b9547bca",
+   "ccb6f571221b631b17d42281ef6c3924961f0d0a",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio/cross-https.downgrade.https.html": [
-   "00228ef7fdc7a52f1cf1e5329f9b13d7e0a9c848",
+   "7a4a31363b870f298e9c09e9ceca3ae604a9e606",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio/same-http-downgrade.downgrade.https.html": [
-   "000ce5e3cd10a5999a4b61b3bb492cdcc30cd3d1",
+   "e1901a495bbf88126d25e06d69e22396d5f8ab60",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio/same-http-downgrade.no-redirect.https.html": [
-   "5216ccbaa2dba41f529473a8acaa69040cc022ea",
+   "3ca933fd7e500f64791d3f5aa5556ea10deb6d1f",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio/same-https.downgrade.https.html": [
-   "464b8d5725bba5fe452f7af08496baf1d20c6eec",
+   "bcf8c88644b4537bf3ece06150a423d5d77d3bc1",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout-import-data/cross-http-downgrade.downgrade.https.html": [
-   "369e51916051662b787d97545bbf8126ecb62627",
+   "413ce2f06e71612632a1b37f148473bd666184ff",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout-import-data/cross-http-downgrade.no-redirect.https.html": [
-   "cb97e532d2991fb5be706415ef52a9aa3a4c3e92",
+   "c3842d2a94cfb77072648f1cf8c9000b32720d50",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout-import-data/cross-https.downgrade.https.html": [
-   "d7706cc6ab8d10b26eb5e6b634765782a7caf359",
+   "864b2faa8d0d15b5483bd9cebfceb1960f9885e2",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout-import-data/same-http-downgrade.downgrade.https.html": [
-   "7b49006155165869de68a07fb544fe5ae8a0c4ce",
+   "755b4c94095da6033a8e9c1c10c4d043ea9227a5",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout-import-data/same-http-downgrade.no-redirect.https.html": [
-   "18995bd301438da062f341dfdb36de8f4fb40335",
+   "91499ff975879202c1a1cb2c3af11a00b7d2941b",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout-import-data/same-https.downgrade.https.html": [
-   "6b8c53a94d19c61fb36ddff09008bead7137a023",
+   "34007608fd9a5bc229d54da61026f9c4ab401004",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout/cross-http-downgrade.downgrade.https.html": [
-   "8acdd3caac295f42dc273de43fa0a60fb0bd0d4c",
+   "9bb3f8ff3d2d9b2d1a355f4cadb2ba358bbfba76",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout/cross-http-downgrade.no-redirect.https.html": [
-   "26167e177bd166f3577fd03d5d375c4f2b020de6",
+   "d5a4f4fbaee8b4d4bbce0436bd7c70a94ab1b992",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout/cross-https.downgrade.https.html": [
-   "13ef09cb3887c91f9630d00b056a352f7e6dabd9",
+   "d3edb0a6dfaf57577c75436ea4427a86ab380bd4",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout/same-http-downgrade.downgrade.https.html": [
-   "cc56f51c2de383af65100e234a10fbc7c91111be",
+   "cb642c6fc325aabf02cf0e5ac602ec229cec2a04",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout/same-http-downgrade.no-redirect.https.html": [
-   "7b622c2f2cb7edb10a35b2bd6e86b5f41c7e3ce8",
+   "585677ac948ea2ef5e0ed78a3098f7813f7464f6",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout/same-https.downgrade.https.html": [
-   "2ce3df1cc9c19c6e2bcc493dc4223af7bf0f337a",
+   "e828b3e1584a53ac51aa6c701ccd906e08f8ed6c",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint-import-data/cross-http-downgrade.downgrade.https.html": [
-   "7516c16b4e37af0562e9491a0acd272f446fae2e",
+   "f9feb9989c4ece495cc7d71a5e4f04e45610f415",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint-import-data/cross-http-downgrade.no-redirect.https.html": [
-   "404386e58bb94ddfc6fa5a6303cb997dd0a14e82",
+   "d6d7f1704fd5894c3d9b29ce5d7f7f1a6afa4a15",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint-import-data/cross-https.downgrade.https.html": [
-   "53b77d6908c1c3bf28cdfcf90c86eeacb94f2bbd",
+   "423363e0daf1fc20f47b3b3450ba7d4b24845a2c",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint-import-data/same-http-downgrade.downgrade.https.html": [
-   "69d4741f47a478910d4ed6ab020142da621b73b2",
+   "ea033c48ff9c593a32a112ed06cf239dec13ab2b",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint-import-data/same-http-downgrade.no-redirect.https.html": [
-   "9a1585db551078bc1b0a7d16b95251f1bdad1c84",
+   "a00354d64e8d466b788f194363f70bc30a48cfd2",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint-import-data/same-https.downgrade.https.html": [
-   "da6197fc1398c6a1b8a958b94e865b2d571ba56b",
+   "99b2a02802a2a88099b709ebb9d217319b04fd70",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint/cross-http-downgrade.downgrade.https.html": [
-   "ab1c859bae291fd1aea9a2ddf98ba8320b033a3a",
+   "c2f8529daa14d23ffb985968b631001bc3564639",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint/cross-http-downgrade.no-redirect.https.html": [
-   "937aaaa8a67d7afb7a2fc37de4bbeddb5e00beef",
+   "138d0e8bee82e83c42f7b1c57351d4b807867f69",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint/cross-https.downgrade.https.html": [
-   "99e10720636f89b7cf2d273f3d40e3922006707b",
+   "418245506ec8e1176eedece408cef19999a8ec0c",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint/same-http-downgrade.downgrade.https.html": [
-   "1d152f66d0797d93653320a9d69aa13fb40e9334",
+   "107797df582c673665f28179931c023fce8b2b91",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint/same-http-downgrade.no-redirect.https.html": [
-   "d6babfe45e293a53a61e0092f565a2d5562a640e",
+   "79523a19211b56aa09e5b0299bb0c5fe31d6b538",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint/same-https.downgrade.https.html": [
-   "a0c28b0701fbaa647f2efc9950776a233ab685de",
+   "9768f6d84dcb928d104c3f60d1203fd21c69db35",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/xhr/cross-http-downgrade.downgrade.https.html": [
-   "9c7776e6347461fa4114ff60f686a22bab330470",
+   "3567cc99e99bbffbb8aadfd7d2d696162f33f4f2",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/xhr/cross-http-downgrade.no-redirect.https.html": [
-   "8300d8fa67b6ba8fa9d1395468e7f260d0dce3b5",
+   "a482929b9df1342af8451d5a0beb07822ca47b92",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/xhr/cross-https.downgrade.https.html": [
-   "96e7c41dba92b76c322705f7c40240277cf2ee9f",
+   "fd7f6987d73e260aa05cebee29ff8dbf4a939e4a",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/xhr/same-http-downgrade.downgrade.https.html": [
-   "146599f5a896008aca3f9d2f72e9b3b6e4305eb0",
+   "1d5958d6d799449c972e941675e7e2df453fdbef",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/xhr/same-http-downgrade.no-redirect.https.html": [
-   "eb6c5689b94af01903fe62e864a2233a0b042fa6",
+   "a33232890b5d2bc7f6223cd7c41d5e5c0a45769c",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/top.meta/upgrade/xhr/same-https.downgrade.https.html": [
-   "2fe37dbe34223bb2dccf062b8bf5b09985b3f7ac",
+   "d7d0438c6a5772efd450452e525068f7600a0419",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/worker-classic-data.meta/unset/fetch/cross-http-downgrade.downgrade.https.html": [
-   "e24fc0838021013b744a848145cee3dfdbffb317",
+   "dd685a04513c18d48b6d59ebcaa1062bde67b2a3",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/worker-classic-data.meta/unset/fetch/cross-http-downgrade.no-redirect.https.html": [
-   "b065f136482506aeb0979a3b27e221762af21d38",
+   "9439de7dbfcc88133a5500ff3d51111bcb7a397c",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/worker-classic-data.meta/unset/fetch/cross-https.downgrade.https.html": [
-   "6ef001bf515350987310a79f885520c1192a5226",
+   "06309cfb9e1e79d97b039d7b43ae9f18ab669db3",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/worker-classic-data.meta/unset/fetch/same-http-downgrade.downgrade.https.html": [
-   "c236aa3db57b95f0e3fd0b04880d2c65ec035cd1",
+   "d6658f06b3017de9f04f52d79397ad14098c1a4c",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/worker-classic-data.meta/unset/fetch/same-http-downgrade.no-redirect.https.html": [
-   "ba07fe78d97b6aa14568b149403432524dd276b1",
+   "067ea1da492395bd9e2c49b6f5802bfec4d03d79",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/worker-classic-data.meta/unset/fetch/same-https.downgrade.https.html": [
-   "04fb348c48dd8b49fdb6d8dc4fa8b09adfbf7a71",
+   "57b1b0f7cda772d7f2107a3dce631dee16b7a8fd",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/worker-classic-data.meta/unset/websocket/cross-ws-downgrade.no-redirect.https.html": [
-   "85b2a842e25558d050be648abb1eb22ced7315b3",
+   "5040b9608b5f9d2fcbd244b3a17dc0bd993ed41a",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/worker-classic-data.meta/unset/websocket/same-ws-downgrade.no-redirect.https.html": [
-   "47a6635e111e718085b60928be7f7ce92815c186",
+   "c1ef17487ca122b870a9a9aa33d0d1a9722b3be0",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/worker-classic-data.meta/unset/xhr/cross-http-downgrade.downgrade.https.html": [
-   "53c56a1f85979ad2d42017f26f8594b604bd08cf",
+   "dc7a3a59426541ea8e4b15af39de64f63dd957a0",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/worker-classic-data.meta/unset/xhr/cross-http-downgrade.no-redirect.https.html": [
-   "b4b9b6f8031ee9b885d60145b4fd84f1b854d1e0",
+   "b1c00ebe520b379e13910be29afdb680f1a03655",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/worker-classic-data.meta/unset/xhr/cross-https.downgrade.https.html": [
-   "4a92b5e470123fc688ff06f0c6573bd9c17d0c69",
+   "0ede5561131db6ef66af130a0eb68e882d82b18a",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/worker-classic-data.meta/unset/xhr/same-http-downgrade.downgrade.https.html": [
-   "0bb47da9c3f980c9ae3d704bdfe984097736a23d",
+   "103199ae6a6c2b68d04cd7d78eddab77f6b77bb9",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/worker-classic-data.meta/unset/xhr/same-http-downgrade.no-redirect.https.html": [
-   "4a7ea8a72f0527d51b4f8b2c3aa0aac0565d0883",
+   "875fac335fcb0f472a68876a5450e9840e963658",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/worker-classic-data.meta/unset/xhr/same-https.downgrade.https.html": [
-   "67d232b65ee0fbcae89fd6ee53adf4228240ca14",
+   "917e6f0b6fbafa4399f696dd50582a73e4d38406",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/fetch/cross-http-downgrade.downgrade.https.html": [
-   "30a09597404068b6d101ba7d3e6976f6928ac98c",
+   "93ff7111e8f76580b66448aa2075466e14ef9b8a",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/fetch/cross-http-downgrade.no-redirect.https.html": [
-   "c726a18a6d6b9f91b28aea33bb2323d40a36dcf7",
+   "68bba09e56e66dfdf03c692380e0f8be79bb15d1",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/fetch/cross-https.downgrade.https.html": [
-   "8d273ac65d19bc80f3b2bb76f722a8bbd8b3dcb8",
+   "b06493d43d2cabc7e10534beb5fca723b0ac790b",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/fetch/same-http-downgrade.downgrade.https.html": [
-   "8c50860d2a9d8968c53adb80c4f19d0da5e9f35a",
+   "bb0cb7b84d5ce99c0d92d24adba9f83e822e46c3",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/fetch/same-http-downgrade.no-redirect.https.html": [
-   "364e95b3c1c121d9f2e0fa0eb4749f74d7320f90",
+   "bfaca7ed201efa388d9eba21c22d27c556fbe2ec",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/fetch/same-https.downgrade.https.html": [
-   "f07d94db67bcf30cf87299bc0801badab1757ee5",
+   "d5102270e7c48a36458f3fb045710da2c2a39b4d",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html": [
-   "fa6232d958ce8efd062c0eb63f8e28663f0d4359",
+   "ff912b7c91ea79461f6b41793d9a2d1382cb15c2",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/websocket/same-ws-downgrade.no-redirect.https.html": [
-   "2da6643940ea8d623bff97a4c38e35ed0bb88254",
+   "5ee233704d3ce2c0c905d69967801fda664cce22",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/xhr/cross-http-downgrade.downgrade.https.html": [
-   "46518de4a6b23b533a62a8642fa61e48cf5b435c",
+   "8981c9056bca3c9767fcd3af9aff8c39e728a45e",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/xhr/cross-http-downgrade.no-redirect.https.html": [
-   "3e8fe269f20348927566fff7dcd7e53c48c938f6",
+   "8fa26126674cf396a3594de25a831b34e5014e08",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/xhr/cross-https.downgrade.https.html": [
-   "4c2853f9e3a1108b92c516c52994efd661ab7f1d",
+   "f945ca101549c5946a00030844dfea8da39cb484",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/xhr/same-http-downgrade.downgrade.https.html": [
-   "e3dbf9fb3ac7e636db81ad1e7db45d040f41a170",
+   "0ef614a96dd35da84cc10977afde53578bff868d",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/xhr/same-http-downgrade.no-redirect.https.html": [
-   "002ed403c7faec202f2ab4382b1099d27eae1f9e",
+   "9a57842a9ef8cdb04a81f1b7865ecfffa20872f2",
    "testharness"
   ],
   "upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/xhr/same-https.downgrade.https.html": [
-   "43c8dcf97b3ea5af9cee9403392b998c8d079a0a",
+   "e993c3abbcb7c57554fafe9aedc6be0c4d514fa4",
    "testharness"
   ],
   "upgrade-insecure-requests/generic/spec_json.js": [
-   "89b17048e22f642255e67aa13bed9bdbecf01bec",
+   "822afa11397701de01572c7f039be75c9d6e060e",
    "support"
   ],
   "upgrade-insecure-requests/generic/test-case.sub.js": [
@@ -726170,19 +726001,19 @@
    "testharness"
   ],
   "web-nfc/NDEFRecord_constructor.https.html": [
-   "ef38a27a0506dfbef88edc16aa13797af64438d1",
+   "a2ea09fa681aff85e0cf69d217a89e9a79a8d96b",
    "testharness"
   ],
   "web-nfc/NDEFWriter-document-hidden-manual.https.html": [
-   "2f291e51412f717001339c02db2fbf1bbd7a1ac6",
+   "1a2839857bb69fc06b6ea779e138b17cf54ca580",
    "manual"
   ],
-  "web-nfc/NDEFWriter_push.https.html": [
-   "33a629781ed7a7c94671b2cfacda50975cde9d61",
+  "web-nfc/NDEFWriter_write.https.html": [
+   "e1224739f06078049e3545f1f9704db2018a9e9e",
    "testharness"
   ],
   "web-nfc/README.md": [
-   "c4efc02ff2a692cf44937466f7aea75635590ded",
+   "15c6534a7be35c478993836d54d451a791619cea",
    "support"
   ],
   "web-nfc/idlharness.https.window.js": [
@@ -726194,7 +726025,7 @@
    "testharness"
   ],
   "web-nfc/resources/nfc-helpers.js": [
-   "45bfa6deced49dd3eb4c38cc5856f123ed1f91b2",
+   "5bec071dfa7ad65fe4181a897ebe91912ee94476",
    "support"
   ],
   "web-nfc/resources/support-iframe.html": [
@@ -729302,7 +729133,7 @@
    "support"
   ],
   "webrtc-identity/idlharness.https.window.js": [
-   "da1cb85a8e7ef147729d4a4f1a77493862dea48c",
+   "8c7bf665ef69487f396519e9e6b45a010854bb3a",
    "testharness"
   ],
   "webrtc-quic/META.yml": [
@@ -729502,7 +729333,7 @@
    "testharness"
   ],
   "webrtc/RTCPeerConnection-createOffer.html": [
-   "c56d45280ef6317bc0ef77b8ad71e9273c809863",
+   "bfd27df3e68e65b98000c08160ac58d575ee71b6",
    "testharness"
   ],
   "webrtc/RTCPeerConnection-generateCertificate.html": [
diff --git a/tests/wpt/metadata/css/css-animations/keyframes-remove-documentElement-crash.html.ini b/tests/wpt/metadata/css/css-animations/keyframes-remove-documentElement-crash.html.ini
deleted file mode 100644
index 1e6c290abb7..00000000000
--- a/tests/wpt/metadata/css/css-animations/keyframes-remove-documentElement-crash.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[keyframes-remove-documentElement-crash.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/metadata/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini b/tests/wpt/metadata/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini
index 70a00a101f6..e35a452a186 100644
--- a/tests/wpt/metadata/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini
+++ b/tests/wpt/metadata/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini
@@ -1,2 +1,2 @@
 [no-transition-from-ua-to-blocking-stylesheet.html]
-  expected: FAIL
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini b/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini
new file mode 100644
index 00000000000..4c79907309b
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini
@@ -0,0 +1,4 @@
+[CaretPosition-001.html]
+  [Element at (400, 100)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index 7807ef6db4c..e98eb06f3ea 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -312,24 +312,21 @@
   [fetch(): separate response Content-Type: text/plain ]
     expected: NOTRUN
 
-  [<iframe>: separate response Content-Type: text/plain */*]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
+  [<iframe>: combined response Content-Type: text/html */*]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html;" text/plain]
+  [<iframe>: combined response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: */* text/html]
+  [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html */*]
+  [<iframe>: separate response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
+  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html;x=" text/plain]
+  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/content-type/script.window.js.ini b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
index d2df9b78483..e67f0406fc3 100644
--- a/tests/wpt/metadata/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
@@ -53,6 +53,3 @@
   [combined text/javascript ]
     expected: FAIL
 
-  [separate text/javascript x/x]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
index f036bb9d96d..a63e414f43a 100644
--- a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -14,6 +14,3 @@
   [X-Content-Type-Options%3A%20%40%23%24%23%25%25%26%5E%26%5E*()()11!%2Cnosniff]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20%22nosniFF%22]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
new file mode 100644
index 00000000000..385376c7321
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_4.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
new file mode 100644
index 00000000000..dc2e45516de
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_5.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index b3bd9f4c289..f6a7aca3306 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,6 +1,5 @@
 [iframe_sandbox_popups_escaping-3.html]
   type: testharness
-  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/webappapis/scripting/events/event-handler-all-global-events.html.ini b/tests/wpt/metadata/html/webappapis/scripting/events/event-handler-all-global-events.html.ini
index f90ce7d2b91..b06b74e40cc 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/events/event-handler-all-global-events.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/events/event-handler-all-global-events.html.ini
@@ -429,3 +429,15 @@
   [onwebkittransitionend: the default value must be null]
     expected: FAIL
 
+  [onwebkittransitionend: the content attribute must execute when an event is dispatched]
+    expected: FAIL
+
+  [onwebkitanimationstart: the content attribute must execute when an event is dispatched]
+    expected: FAIL
+
+  [onwebkitanimationend: the content attribute must execute when an event is dispatched]
+    expected: FAIL
+
+  [onwebkitanimationiteration: the content attribute must execute when an event is dispatched]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/performance-timeline/webtiming-resolution.any.js.ini b/tests/wpt/metadata/performance-timeline/webtiming-resolution.any.js.ini
index 6d08beab111..97f8a0cc51f 100644
--- a/tests/wpt/metadata/performance-timeline/webtiming-resolution.any.js.ini
+++ b/tests/wpt/metadata/performance-timeline/webtiming-resolution.any.js.ini
@@ -10,3 +10,6 @@
   [Verifies the resolution of entry.startTime is at least 20 microseconds.]
     expected: TIMEOUT
 
+  [Verifies the resolution of performance.now() is at least 5 microseconds.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata/webmessaging/without-ports/017.html.ini
index 064cf47545b..064cf47545b 100644
--- a/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
+++ b/tests/wpt/metadata/webmessaging/without-ports/017.html.ini
diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/accept-ch-test.js b/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/accept-ch-test.js
index ed635513fd7..0ee5059cb67 100644
--- a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/accept-ch-test.js
+++ b/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/accept-ch-test.js
@@ -22,7 +22,7 @@ const run_test = test => {
   }, test.name + " precondition: Test that the browser does not have client " +
     "hints preferences cached");
 
-  // Then, attempt to set Accept-CH-Lifetime for 1 second
+  // Then, attempt to set Accept-CH
   promise_test(t => {
     return new Promise(resolve => {
       if (test.type == "navigation") {
diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/accept-ch.html.headers b/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/accept-ch.html.headers
index 370f9869226..3f073bfe613 100644
--- a/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/accept-ch.html.headers
+++ b/tests/wpt/web-platform-tests/client-hints/accept-ch-stickiness/resources/accept-ch.html.headers
@@ -1,3 +1,2 @@
 Accept-CH: device-memory, DPR
-Accept-CH-Lifetime: 1
 Access-Control-Allow-Origin: *
diff --git a/tests/wpt/web-platform-tests/common/security-features/tools/generate.py b/tests/wpt/web-platform-tests/common/security-features/tools/generate.py
index 3c298b5a3e2..ba997067b3f 100755
--- a/tests/wpt/web-platform-tests/common/security-features/tools/generate.py
+++ b/tests/wpt/web-platform-tests/common/security-features/tools/generate.py
@@ -261,9 +261,8 @@ def generate_test_source_files(spec_directory, spec_json, target):
             expand_pattern(excluded_pattern, test_expansion_schema)
         for excluded_selection in permute_expansion(excluded_expansion,
                                                     artifact_order):
-            excluded_selection_path = spec_json[
-                'selection_pattern'] % excluded_selection
-            exclusion_dict[excluded_selection_path] = True
+            excluded_selection['delivery_key'] = spec_json['delivery_key']
+            exclusion_dict[dump_test_parameters(excluded_selection)] = True
 
     for spec in specification:
         # Used to make entries with expansion="override" override preceding
@@ -276,20 +275,20 @@ def generate_test_source_files(spec_directory, spec_json, target):
             for selection in permute_expansion(expansion, artifact_order):
                 selection['delivery_key'] = spec_json['delivery_key']
                 selection_path = spec_json['selection_pattern'] % selection
-                if not selection_path in exclusion_dict:
-                    if selection_path in output_dict:
-                        if expansion_pattern['expansion'] != 'override':
-                            print(
-                                "Error: %s's expansion is default but overrides %s"
-                                % (selection['name'],
-                                   output_dict[selection_path]['name']))
-                            sys.exit(1)
-                    output_dict[selection_path] = copy.deepcopy(selection)
-                else:
-                    print('Excluding selection:', selection_path)
+                if selection_path in output_dict:
+                    if expansion_pattern['expansion'] != 'override':
+                        print(
+                            "Error: %s's expansion is default but overrides %s"
+                            % (selection['name'],
+                               output_dict[selection_path]['name']))
+                        sys.exit(1)
+                output_dict[selection_path] = copy.deepcopy(selection)
 
         for selection_path in output_dict:
             selection = output_dict[selection_path]
+            if dump_test_parameters(selection) in exclusion_dict:
+                print('Excluding selection:', selection_path)
+                continue
             try:
                 generate_selection(spec_directory, spec_json, selection, spec,
                                    html_template)
diff --git a/tests/wpt/web-platform-tests/common/security-features/tools/util.py b/tests/wpt/web-platform-tests/common/security-features/tools/util.py
index 269f464a547..f31029644dd 100644
--- a/tests/wpt/web-platform-tests/common/security-features/tools/util.py
+++ b/tests/wpt/web-platform-tests/common/security-features/tools/util.py
@@ -1,6 +1,7 @@
 from __future__ import print_function
 
 import os, sys, json, re
+import collections
 
 script_directory = os.path.dirname(os.path.abspath(__file__))
 template_directory = os.path.abspath(
@@ -30,7 +31,7 @@ def load_spec_json(path_to_spec):
     re_error_location = re.compile('line ([0-9]+) column ([0-9]+)')
     with open(path_to_spec, "r") as f:
         try:
-            return json.load(f)
+            return json.load(f, object_pairs_hook=collections.OrderedDict)
         except ValueError as ex:
             print(ex.message)
             match = re_error_location.search(ex.message)
diff --git a/tests/wpt/web-platform-tests/content-security-policy/support/checkReport.sub.js b/tests/wpt/web-platform-tests/content-security-policy/support/checkReport.sub.js
index 1ecfa5f52c4..3137b926ae8 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/support/checkReport.sub.js
+++ b/tests/wpt/web-platform-tests/content-security-policy/support/checkReport.sub.js
@@ -47,7 +47,7 @@
   // is to wait for some reasonable amount of time and if no report has been
   // received to conclude that no report has been generated. These timeouts must
   // not exceed the test timeouts set by vendors otherwise the test would fail.
-  var timeout = document.querySelector("meta[name=timeout][content=long]") ? 25 : 5;
+  var timeout = document.querySelector("meta[name=timeout][content=long]") ? 20 : 3;
   var reportLocation = location.protocol + "//" + location.host + "/content-security-policy/support/report.py?op=retrieve_report&timeout=" + timeout + "&reportID=" + reportID;
 
   if (testName == "") testName = "Violation report status OK.";
diff --git a/tests/wpt/web-platform-tests/css/css-animations/keyframes-remove-documentElement-crash.html b/tests/wpt/web-platform-tests/css/css-animations/keyframes-remove-documentElement-crash.html
index aba7f9c6edd..9573ce1b0f8 100644
--- a/tests/wpt/web-platform-tests/css/css-animations/keyframes-remove-documentElement-crash.html
+++ b/tests/wpt/web-platform-tests/css/css-animations/keyframes-remove-documentElement-crash.html
@@ -1,8 +1,7 @@
 <!doctype html>
+<html class="test-wait">
 <title>CSS Animations Test: Chrome crash when removing documentElement and @keyframes stylesheet</title>
 <link rel="help" href="https://crbug.com/999522">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
 <style>
   @keyframes anim {
     from { color: pink }
@@ -14,9 +13,16 @@
 </style>
 <div></div>
 <script>
-  test(() => {
-    document.body.offsetTop;
-    document.querySelector("style").remove();
-    document.documentElement.remove();
-  }, "Removing documentElement and @keyframes sheet should not crash.");
+window.addEventListener('load', () => {
+  document.body.offsetTop;
+  document.querySelector("style").remove();
+  // We need the root later to remove the test-wait class.
+  const root = document.documentElement;
+  document.documentElement.remove();
+
+  // rAF to make sure that style runs.
+  requestAnimationFrame(() => {
+    root.classList.remove('test-wait');
+  });
+});
 </script>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-computed-size.html b/tests/wpt/web-platform-tests/css/css-pseudo/marker-computed-size.html
new file mode 100644
index 00000000000..76851369ab5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/marker-computed-size.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Pseudo-Elements Test: Computed size of ::marker</title>
+<link rel="help" href="https://drafts.csswg.org/css-pseudo-4/#marker-pseudo">
+<link rel="help" href="https://drafts.csswg.org/css-lists/#content-property">
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com">
+<meta name="assert" content="This test checks that getComputedStyle exposes the resolved sizes of a ::marker." />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+:root {
+  --image: url('/images/green-100x50.png');
+}
+:root::after {
+  /* Preload image */
+  content: var(--image);
+}
+#target {
+  font: 10px/1 Ahem;
+  --content: normal;
+}
+#target::marker {
+  content: var(--content);
+}
+</style>
+<div id="log"></div>
+<ul>
+  <li id="target"></li>
+</ul>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+const target = document.getElementById("target");
+function checkMarkerSize(expectedWidth, expectedHeight) {
+  const {width, height} = getComputedStyle(target, "::marker");
+  assert_equals(width, expectedWidth, "width");
+  assert_equals(height, expectedHeight, "height");
+}
+setup({explicit_done: true});
+addEventListener("load", () => {
+  test(() => {
+    // Marker string: "1. "
+    target.style.listStyleType = "decimal";
+    checkMarkerSize("30px", "10px");
+  }, "Decimal ::marker");
+  test(() => {
+    // Marker string: "10. "
+    target.setAttribute("value", "10");
+    checkMarkerSize("40px", "10px");
+  }, "Decimal ::marker with custom value");
+  test(() => {
+    // Marker string: "st"
+    target.style.listStyleType = "'st'";
+    checkMarkerSize("20px", "10px");
+  }, "String ::marker");
+  test(() => {
+    // No marker box
+    target.style.listStyleType = "none";
+    checkMarkerSize("auto", "auto");
+  }, "::marker with no box due to 'list-style'");
+  test(() => {
+    // Marker contents: "foo", "bar"
+    target.style.setProperty("--content", "'foo' 'bar'");
+    checkMarkerSize("60px", "10px");
+  }, "::marker with custom string contents");
+  test(() => {
+    // Marker contents: 100x50 image (+2px due to baseline alignment)
+    target.style.setProperty("--content", "var(--image)");
+    checkMarkerSize("100px", "52px");
+  }, "::marker with custom image contents");
+  test(() => {
+    // Marker contents: "foo", 100x50 image (+2px due to baseline alignment)
+    target.style.setProperty("--content", "'foo' var(--image)");
+    checkMarkerSize("130px", "52px");
+  }, "::marker with custom string and image contents");
+  test(() => {
+    // No marker box
+    target.style.listStyleType = "";
+    target.style.setProperty("--content", "none");
+    checkMarkerSize("auto", "auto");
+  }, "::marker with no box due to 'content'");
+  done();
+}, {once: true});
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/serialization.html b/tests/wpt/web-platform-tests/css/css-shadow-parts/serialization.html
new file mode 100644
index 00000000000..50ad3df53a3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-shadow-parts/serialization.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>CSS Shadow Parts - Serialization</title>
+    <link href="https://drafts.csswg.org/css-shadow-parts/" rel="help">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+  </head>
+  <body>
+    <style id="styleElement">
+      ::part(\(foo) {}
+      ::part(   bar\    ) {}
+      ::part( -foo  bar    ) {}
+    </style>
+    <script>
+      "use strict";
+      const rules = styleElement.sheet.cssRules;
+      test(function() {
+        assert_equals(rules[0].selectorText, "::part(\\(foo)");
+      }, "Escape start parenthesis in ::part name.");
+      test(function() {
+        assert_equals(rules[1].selectorText, "::part(bar\\ )");
+      }, "Escape start space in ::part name.");
+      test(function() {
+        assert_equals(rules[2].selectorText, "::part(-foo bar)");
+      }, "Collapse spaces in ::part names list.");
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/cssom/selectorSerialize.html b/tests/wpt/web-platform-tests/css/cssom/selectorSerialize.html
index e95f453ba1c..f3a402f5f07 100644
--- a/tests/wpt/web-platform-tests/css/cssom/selectorSerialize.html
+++ b/tests/wpt/web-platform-tests/css/cssom/selectorSerialize.html
@@ -70,6 +70,7 @@
             test(function(){
                 assert_selector_serializes_to(':lang(ja)', ':lang(ja)');
                 assert_selector_serializes_to(':lang( ja )', ':lang(ja)');
+                assert_selector_serializes_to(':lang( j\\ a )', ':lang(j\\ a)');
             }, 'single pseudo (simple) selector "lang" which accepts arguments in the sequence of simple selectors that is not a universal selector')
 
 
diff --git a/tests/wpt/web-platform-tests/css/selectors/webkit-pseudo-element.html b/tests/wpt/web-platform-tests/css/selectors/webkit-pseudo-element.html
index 8b4adddba8f..5ba98eba21b 100644
--- a/tests/wpt/web-platform-tests/css/selectors/webkit-pseudo-element.html
+++ b/tests/wpt/web-platform-tests/css/selectors/webkit-pseudo-element.html
@@ -10,7 +10,7 @@
 #test {
   color: rgb(255, 0, 0);
 }
-span::-webkit-something-invalid, #test, ::-WeBkIt-sOmEtHiNg-NoNeXiSt123 {
+span::-webkit-something-invalid, #test, ::-WeBkIt-sOmEtHiNg-NoNeXiSt123, ::-webkit-\ escaped {
   color: rgb(0, 255, 0);
 }
 ::-webkitfoo, #test {
@@ -29,7 +29,8 @@ span::-webkit-something-invalid, #test, ::-WeBkIt-sOmEtHiNg-NoNeXiSt123 {
     let sheet = document.getElementById("style").sheet;
     assert_equals(sheet.cssRules[1].selectorText,
                   "span::-webkit-something-invalid, " +
-                  "#test, ::-webkit-something-nonexist123");
+                  "#test, ::-webkit-something-nonexist123, " +
+                  "::-webkit-\\ escaped");
   }, "webkit-prefixed pseudo-element selectors should be accessible from CSSOM");
 
   test(() => {
diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/crashtest.md b/tests/wpt/web-platform-tests/docs/writing-tests/crashtest.md
index e20e5036ede..76ae46b1e59 100644
--- a/tests/wpt/web-platform-tests/docs/writing-tests/crashtest.md
+++ b/tests/wpt/web-platform-tests/docs/writing-tests/crashtest.md
@@ -12,11 +12,10 @@ The simplest crashtest is a single HTML file with any content. The
 test passes if the load event is reached, and the browser finishes
 painting, without terminating.
 
-In some cases crashtests may need to perform work after the initial
-page load. In this case the test may specify a `class=wait` attribute
-on the root element. The test will not complete until that attribute
-is removed from the root. At the time when the test would otherwise
-have ended a `TestRendered` event is emitted; test authors can use
-this event to perform modifications that are guaranteed not to be
-batched with the initial paint. This matches the behaviour of
-[reftests](reftests).
+In some cases crashtests may need to perform work after the initial page load.
+In this case the test may specify a `class=test-wait` attribute on the root
+element. The test will not complete until that attribute is removed from the
+root. At the time when the test would otherwise have ended a `TestRendered`
+event is emitted; test authors can use this event to perform modifications that
+are guaranteed not to be batched with the initial paint. This matches the
+behaviour of [reftests](reftests).
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/blob.https.html b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/blob.https.html
index aa4cf969d9e..77af2bc77de 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/blob.https.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/blob.https.html
@@ -28,14 +28,13 @@ const origins = get_host_info();
       t.add_cleanup(() => { frame.remove(); });
       const path = new URL("resources/blob-url-factory.html", window.location).pathname;
       frame.src = `${origin}${path}?id=${id}&variant=${variant}&crossOrigin=${crossOrigin}`;
-      window.addEventListener("message", t.step_func(({ data }) => {
+      window.addEventListener("message", t.step_func_done(({ data }) => {
         if (data.id !== id) {
           return;
         }
         assert_equals(data.origin, origin);
         assert_true(data.sameOriginNoCORPSuccess, "Same-origin without CORP did not succeed");
         assert_true(data.crossOriginNoCORPFailure, "Cross-origin without CORP did not fail");
-        t.done();
       }));
       document.body.append(frame);
     }, `Cross-Origin-Embedder-Policy and blob: URL from ${origin} in subframe via ${variant}`);
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/blob-popup.https.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/blob-popup.https.html
new file mode 100644
index 00000000000..4aef1b84891
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/blob-popup.https.html
@@ -0,0 +1,39 @@
+<!doctype html>
+<title>Cross-Origin-Opener-Policy and a blob URL popup</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src=/common/get-host-info.sub.js></script>
+<script src="/common/utils.js"></script>
+<script>
+async_test(t => {
+  window.test = t; // Make the test available globally so the blob URL can use it
+  window.furtherPopup = null;
+
+  const bc = new BroadcastChannel(token());
+  bc.onmessage = t.step_func_done(({ data }) => {
+    assert_equals(data.name, "");
+    assert_false(data.opener);
+    assert_true(furtherPopup.closed);
+    assert_equals(furtherPopup.document.URL, "about:blank");
+  });
+
+  const blobContents = `<script>
+const w = window.open("${get_host_info().HTTPS_REMOTE_ORIGIN}/html/cross-origin-opener-policy/resources/coop-coep.py?coop=x&coep=x&channel=${bc.name}", "${bc.name}");
+window.opener.furtherPopup = w;
+
+// w will be closed by its postback iframe. When out of process,
+// window.close() does not work.
+window.opener.test.add_cleanup(() => w.close());
+<\/script>`;
+  const blob = new Blob([blobContents], { type: "text/html" });
+  const blobURL = URL.createObjectURL(blob);
+  const popup = window.open(blobURL);
+  t.add_cleanup(() => popup.close());
+  popup.onload = t.step_func(() => {
+    assert_equals(popup.opener, window);
+    assert_equals(popup.location.href, blobURL);
+    assert_equals(popup.document.URL, blobURL);
+    assert_equals(popup.origin, window.origin);
+  });
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/blob-popup.https.html.headers b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/blob-popup.https.html.headers
new file mode 100644
index 00000000000..46ad58d83bf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/blob-popup.https.html.headers
@@ -0,0 +1 @@
+Cross-Origin-Opener-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coep-blob-popup.https.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coep-blob-popup.https.html
new file mode 100644
index 00000000000..c66988d0a65
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coep-blob-popup.https.html
@@ -0,0 +1,45 @@
+<!doctype html>
+<title>Cross-Origin-Opener-Policy and Cross-Origin-Embedder-Policy: blob URL popup</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src=/common/get-host-info.sub.js></script>
+<script src=../cross-origin-embedder-policy/resources/script-factory.js></script>
+<script>
+["window.open()", "<a>", "<a rel=noopener>"].forEach(type => {
+  promise_test(t => {
+    const origins = get_host_info();
+    const id = `tut mir leid ${type}`;
+    const blob = new Blob([createScript(origins.ORIGIN, origins.HTTPS_REMOTE_ORIGIN, "opener", id)], {type: "text/html"});
+    const blobURL = URL.createObjectURL(blob);
+
+    if (type === "window.open()") {
+      const popup = window.open(blobURL);
+      t.add_cleanup(() => popup.close());
+      popup.onload = t.step_func(() => {
+        assert_equals(popup.opener, window);
+        assert_equals(popup.location.href, blobURL);
+        assert_equals(popup.document.URL, blobURL);
+        assert_equals(popup.origin, window.origin);
+      });
+    } else {
+      const a = document.createElement("a");
+      a.target = type;
+      if (type === "<a rel=noopener>") {
+        a.rel = "noopener";
+      }
+      a.href = blobURL;
+      a.click();
+    }
+
+    return new Promise(resolve => {
+      window.addEventListener("message", t.step_func(({ data }) => {
+        assert_equals(data.id, id);
+        assert_equals(data.origin, window.origin);
+        assert_true(data.sameOriginNoCORPSuccess, "Same-origin without CORP did not succeed");
+        assert_true(data.crossOriginNoCORPFailure, "Cross-origin without CORP did not fail");
+        resolve();
+      }));
+    });
+  }, `COOP+COEP blob URL popup: ${type}`);
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coep-blob-popup.https.html.headers b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coep-blob-popup.https.html.headers
new file mode 100644
index 00000000000..63b60e490f4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coep-blob-popup.https.html.headers
@@ -0,0 +1,2 @@
+Cross-Origin-Opener-Policy: same-origin
+Cross-Origin-Embedder-Policy: require-corp
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-same-origin-allow-popups.https.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-same-origin-allow-popups.https.html
new file mode 100644
index 00000000000..0c33b40b181
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-same-origin-allow-popups.https.html
@@ -0,0 +1,43 @@
+<!doctype html>
+<meta charset=utf-8>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="resources/common.js"></script>
+
+<div id=log></div>
+<script>
+[
+[SAME_ORIGIN, SAME_ORIGIN, "same-origin", false, false],
+[SAME_SITE, SAME_ORIGIN, "same-origin", false, false],
+[CROSS_ORIGIN, SAME_ORIGIN, "same-origin", false, false],
+[SAME_ORIGIN, SAME_SITE, "same-origin", false, false],
+[SAME_SITE, SAME_SITE, "same-origin", false, false],
+[CROSS_ORIGIN, SAME_SITE, "same-origin", false, false],
+[SAME_ORIGIN, CROSS_ORIGIN, "same-origin", false, false],
+[SAME_SITE, CROSS_ORIGIN, "same-origin", false, false],
+[CROSS_ORIGIN, CROSS_ORIGIN, "same-origin", false, false],
+[SAME_ORIGIN, SAME_ORIGIN, "same-origin-allow-popups", true, true],
+[SAME_SITE, SAME_ORIGIN, "same-origin-allow-popups", false, false],
+[CROSS_ORIGIN, SAME_ORIGIN, "same-origin-allow-popups", false, false],
+[SAME_ORIGIN, SAME_SITE, "same-origin-allow-popups", false, false],
+[SAME_SITE, SAME_SITE, "same-origin-allow-popups", false, false],
+[CROSS_ORIGIN, SAME_SITE, "same-origin-allow-popups", false, false],
+[SAME_ORIGIN, CROSS_ORIGIN, "same-origin-allow-popups", false, false],
+[SAME_SITE, CROSS_ORIGIN, "same-origin-allow-popups", false, false],
+[CROSS_ORIGIN, CROSS_ORIGIN, "same-origin-allow-popups", false, false],
+[SAME_ORIGIN, SAME_ORIGIN, "", true, true],
+[SAME_SITE, SAME_ORIGIN, "", true, true],
+[CROSS_ORIGIN, SAME_ORIGIN, "", true, true],
+[SAME_ORIGIN, SAME_SITE, "", true, true],
+[SAME_SITE, SAME_SITE, "", true, true],
+[CROSS_ORIGIN, SAME_SITE, "", true, true],
+[SAME_ORIGIN, CROSS_ORIGIN, "", true, true],
+[SAME_SITE, CROSS_ORIGIN, "", true, true],
+[CROSS_ORIGIN, CROSS_ORIGIN, "", true, true],
+].forEach( value => {
+    run_coop_test_iframe("same-origin-allow-popups", value[0], value[1], value[2], value[3], value[4]);
+});
+
+
+</script>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-same-origin-allow-popups.https.html.headers b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-same-origin-allow-popups.https.html.headers
new file mode 100644
index 00000000000..d83ed86fb9b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-same-origin-allow-popups.https.html.headers
@@ -0,0 +1 @@
+Cross-Origin-Opener-Policy: same-origin-allow-popups
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-same-origin.https.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-same-origin.https.html
new file mode 100644
index 00000000000..2b7decd39cf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-same-origin.https.html
@@ -0,0 +1,33 @@
+<!doctype html>
+<meta charset=utf-8>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="resources/common.js"></script>
+
+<div id=log></div>
+<script>
+[
+[SAME_ORIGIN, SAME_ORIGIN, "same-origin", true, true],
+[SAME_SITE, SAME_ORIGIN, "same-origin", false, true],
+[CROSS_ORIGIN, SAME_ORIGIN, "same-origin", false, true],
+[SAME_ORIGIN, SAME_SITE, "same-origin", false, false],
+[SAME_SITE, SAME_SITE, "same-origin", false, true],
+[CROSS_ORIGIN, SAME_SITE, "same-origin", false, true],
+[SAME_ORIGIN, CROSS_ORIGIN, "same-origin", false, false],
+[SAME_SITE, CROSS_ORIGIN, "same-origin", false, true],
+[CROSS_ORIGIN, CROSS_ORIGIN, "same-origin", false, true],
+[SAME_ORIGIN, SAME_ORIGIN, "", false, false],
+[SAME_SITE, SAME_ORIGIN, "", false, true],
+[CROSS_ORIGIN, SAME_ORIGIN, "", false, true],
+[SAME_ORIGIN, SAME_SITE, "", false, false],
+[SAME_SITE, SAME_SITE, "", false, true],
+[CROSS_ORIGIN, SAME_SITE, "", false, true],
+[SAME_ORIGIN, CROSS_ORIGIN, "", false, false],
+[SAME_SITE, CROSS_ORIGIN, "", false, true],
+[CROSS_ORIGIN, CROSS_ORIGIN, "", false, true],
+].forEach( value => {
+    run_coop_test_iframe("same-origin", value[0], value[1], value[2], value[3], value[4]);
+});
+
+</script>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-same-origin.https.html.headers b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-same-origin.https.html.headers
new file mode 100644
index 00000000000..46ad58d83bf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-same-origin.https.html.headers
@@ -0,0 +1 @@
+Cross-Origin-Opener-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-unsafe-none.https.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-unsafe-none.https.html
new file mode 100644
index 00000000000..78a18118504
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-unsafe-none.https.html
@@ -0,0 +1,33 @@
+<!doctype html>
+<meta charset=utf-8>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="resources/common.js"></script>
+
+<div id=log></div>
+<script>
+[
+[SAME_ORIGIN, SAME_ORIGIN, "same-origin", false, false],
+[SAME_SITE, SAME_ORIGIN, "same-origin", false, false],
+[CROSS_ORIGIN, SAME_ORIGIN, "same-origin", false, false],
+[SAME_ORIGIN, SAME_SITE, "same-origin", false, false],
+[SAME_SITE, SAME_SITE, "same-origin", false, false],
+[CROSS_ORIGIN, SAME_SITE, "same-origin", false, false],
+[SAME_ORIGIN, CROSS_ORIGIN, "same-origin", false, false],
+[SAME_SITE, CROSS_ORIGIN, "same-origin", false, false],
+[CROSS_ORIGIN, CROSS_ORIGIN, "same-origin", false, false],
+[SAME_ORIGIN, SAME_ORIGIN, "", true, true],
+[SAME_SITE, SAME_ORIGIN, "", true, true],
+[CROSS_ORIGIN, SAME_ORIGIN, "", true, true],
+[SAME_ORIGIN, SAME_SITE, "", true, true],
+[SAME_SITE, SAME_SITE, "", true, true],
+[CROSS_ORIGIN, SAME_SITE, "", true, true],
+[SAME_ORIGIN, CROSS_ORIGIN, "", true, true],
+[SAME_SITE, CROSS_ORIGIN, "", true, true],
+[CROSS_ORIGIN, CROSS_ORIGIN, "", true, true],
+].forEach( value => {
+    run_coop_test_iframe("unsafe-none", value[0], value[1], value[2], value[3], value[4]);
+});
+
+</script>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-unsafe-none.https.html.headers b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-unsafe-none.https.html.headers
new file mode 100644
index 00000000000..073ce7adfbd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-unsafe-none.https.html.headers
@@ -0,0 +1 @@
+Cross-Origin-Opener-Policy: unsafe-none
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/common.js b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/common.js
index 477bc6c948f..59ba33d65b0 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/common.js
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/common.js
@@ -38,3 +38,23 @@ function run_coop_tests(documentCOOPValueTitle, testArray) {
     }, `${documentCOOPValueTitle} document opening popup to ${test[0].origin} with COOP: "${test[1]}"`);
   }
 }
+
+function run_coop_test_iframe (documentTitle, iframe_origin, popup_origin, popup_coop, expects_opener, expects_name) {
+  const name = iframe_origin.name + "_iframe_opening_" + popup_origin.name + "_popup_with_coop_" + popup_coop;
+  async_test(t => {
+      const frame = document.createElement("iframe");
+      t.add_cleanup(() => { frame.remove(); });
+
+      const origin = CROSS_ORIGIN.origin;
+      const path = new URL("resources/iframe-popup.sub.html", window.location).pathname;
+      const bc = new BroadcastChannel(name);
+      frame.src = `${iframe_origin.origin}${path}?popup_origin=${popup_origin.origin}&popup_coop=${popup_coop}&channel=${name}`;
+
+      bc.onmessage = t.step_func_done(event => {
+              const payload = event.data;
+              assert_equals(payload.opener, expects_opener, 'opener');
+              assert_equals(payload.name, expects_name? name:"", 'name');
+      });
+      document.body.append(frame);
+  }, `${documentTitle} with ${iframe_origin.name} iframe opening popup a ${popup_origin.name} with COOP: ${popup_coop}`);
+}
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/iframe-popup.sub.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/iframe-popup.sub.html
new file mode 100644
index 00000000000..748fd996cfb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/iframe-popup.sub.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<meta charset=utf-8>
+
+<script>
+const popup_origin = new URL(location).searchParams.get("popup_origin");
+const channelName = new URL(location).searchParams.get("channel");
+const popup_coop  = new URL(location).searchParams.get("popup_coop");
+const url = `${popup_origin}/html/cross-origin-opener-policy/resources/coop-coep.py?coop=${encodeURIComponent(popup_coop)}&coep=&channel=${channelName}`;
+
+window.open(url, channelName);
+</script>
diff --git a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-all-global-events.html b/tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-all-global-events.html
index caeac8e8a50..ee8c34ced31 100644
--- a/tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-all-global-events.html
+++ b/tests/wpt/web-platform-tests/html/webappapis/scripting/events/event-handler-all-global-events.html
@@ -10,6 +10,16 @@
 
 <script>
 "use strict";
+
+// The prefixed animation events are special; their event types are
+// camel-case.
+const prefixedAnimationAttributeToEventType = new Map([
+  ["webkitanimationend", "webkitAnimationEnd"],
+  ["webkitanimationiteration", "webkitAnimationIteration"],
+  ["webkitanimationstart", "webkitAnimationStart"],
+  ["webkittransitionend", "webkitTransitionEnd"],
+]);
+
 setup({ explicit_done: true });
 
 fetch("/interfaces/html.idl").then(res => res.text()).then(htmlIDL => {
@@ -54,7 +64,11 @@ fetch("/interfaces/html.idl").then(res => res.text()).then(htmlIDL => {
       const el = document.createElement("div");
       el.setAttribute(name, `window.${name}Happened2 = true;`);
 
-      el.dispatchEvent(new Event(withoutOn));
+      let eventType = withoutOn;
+      if (prefixedAnimationAttributeToEventType.has(eventType)) {
+        eventType = prefixedAnimationAttributeToEventType.get(eventType);
+      }
+      el.dispatchEvent(new Event(eventType));
 
       assert_true(window[name + "Happened2"], "Dispatching an event must run the code");
     }, `${name}: the content attribute must execute when an event is dispatched`);
diff --git a/tests/wpt/web-platform-tests/import-maps/common/README.md b/tests/wpt/web-platform-tests/import-maps/common/README.md
index cda42d06099..6092c0d7670 100644
--- a/tests/wpt/web-platform-tests/import-maps/common/README.md
+++ b/tests/wpt/web-platform-tests/import-maps/common/README.md
@@ -6,7 +6,12 @@ tests for the reference JavaScript implementation at [WICG repository](https://g
 
 ## Basics
 
-A **test object** describes a set of parameters (import maps and base URLs) and specifiers to be tested.
+A **test object** describes a set of parameters (import maps and base URLs) and test expectations.
+Test expectations can be:
+
+- Expected resulting URLs for specifiers (resolution tests), or
+- Expected parsed import maps (parsing tests).
+
 Each JSON file under [resources/](resources/) directory consists of a test object.
 A minimum test object would be:
 
@@ -33,10 +38,11 @@ Required fields:
     - In WPT tests, this is used for the test name of `promise_test()` together with specifier to be resolved, like `"Main test name: a"`.
 - `importMap` (object or string): the import map to be attached.
 - `importMapBaseURL` (string): the base URL used for [parsing the import map](https://wicg.github.io/import-maps/#parse-an-import-map-string).
-- `baseURL` (string): the base URL used in [resolving a specifier](https://wicg.github.io/import-maps/#resolve-a-module-specifier) for each specifiers.
-- `expectedResults` (object; string to (string or null)): test cases.
+- (resolution tests only) `expectedResults` (object; string to (string or null)): resolution test cases.
     - The keys are specifiers to be resolved.
     - The values are expected resolved URLs. If `null`, resolution should fail.
+- (resolution tests only) `baseURL` (string): the base URL used in [resolving a specifier](https://wicg.github.io/import-maps/#resolve-a-module-specifier) for each specifiers.
+- (parsing tests only) `expectedParsedImportMap` (object): the expected parsed import map for parsing test cases.
 
 Optional fields:
 
diff --git a/tests/wpt/web-platform-tests/import-maps/common/parsing.tentative.html b/tests/wpt/web-platform-tests/import-maps/common/parsing.tentative.html
new file mode 100644
index 00000000000..d3334d7bbb9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/import-maps/common/parsing.tentative.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<meta name="timeout" content="long">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<script type="module">
+import { runTestsFromJSON } from "./resources/common-test-helper.js";
+
+for (const json of [
+  'resources/parsing-addresses-absolute.json',
+  'resources/parsing-addresses-invalid.json',
+  'resources/parsing-addresses.json',
+  'resources/parsing-invalid-json.json',
+  'resources/parsing-schema-normalization.json',
+  'resources/parsing-schema-scope.json',
+  'resources/parsing-schema-specifier-map.json',
+  'resources/parsing-schema-toplevel.json',
+  'resources/parsing-scope-keys.json',
+  'resources/parsing-specifier-keys.json',
+  'resources/parsing-trailing-slashes.json',
+]) {
+  promise_test(() =>
+    runTestsFromJSON(json),
+    "Test helper: fetching and sanity checking test JSON: " + json);
+}
+</script>
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/common-test-helper.js b/tests/wpt/web-platform-tests/import-maps/common/resources/common-test-helper.js
index 002c4b51fd0..0ddad9fe150 100644
--- a/tests/wpt/web-platform-tests/import-maps/common/resources/common-test-helper.js
+++ b/tests/wpt/web-platform-tests/import-maps/common/resources/common-test-helper.js
@@ -2,17 +2,15 @@ setup({allow_uncaught_exception : true});
 
 // Creates a new Document (via <iframe>) and add an inline import map.
 function parse(importMap, importMapBaseURL) {
-  return new Promise((resolve, reject) => {
+  return new Promise(resolve => {
     const importMapString = JSON.stringify(importMap);
     const iframe = document.createElement('iframe');
 
     window.addEventListener('message', event => {
-        if (event.data.type === 'Success') {
-          resolve(iframe);
-        } else {
-          // Currently we don't distinguish fetch errors and parse errors.
-          reject(event.data.error);
-        }
+        // Parsing result is saved here and checked later, rather than
+        // rejecting the promise on errors.
+        iframe.parseImportMapResult = event.data.type;
+        resolve(iframe);
       },
       {once: true});
 
@@ -40,18 +38,28 @@ function parse(importMap, importMapBaseURL) {
       // Handle specifier resolution requests from the parent frame.
       window.addEventListener('message', event => {
         try {
-          // URL resolution is tested using Chromium's internals.
-          // TODO(hiroshige): Remove the Chromium-specific dependency.
-          const result = internals.resolveModuleSpecifier(
-              event.data.specifier,
-              event.data.baseURL,
-              document);
-          parent.postMessage({type: 'ResolutionSuccess', result: result}, '*');
+          if (event.data.action === 'resolve') {
+            // URL resolution is tested using Chromium's internals.
+            // TODO(hiroshige): Remove the Chromium-specific dependency.
+            const result = internals.resolveModuleSpecifier(
+                event.data.specifier,
+                event.data.baseURL,
+                document);
+            parent.postMessage({type: 'ResolutionSuccess', result: result}, '*');
+         } else if (event.data.action === 'getParsedImportMap') {
+           parent.postMessage({
+               type: 'GetParsedImportMapSuccess',
+               result: internals.getParsedImportMap(document)}, '*');
+         } else {
+           parent.postMessage({
+               type: 'Failure',
+               result: "Invalid Action: " + event.data.action}, '*');
+         }
         } catch (e) {
           // We post error names instead of error objects themselves and
           // re-create error objects later, to avoid issues around serializing
           // error objects which is a quite new feature.
-          parent.postMessage({type: 'ResolutionFailure', result: e.name}, '*');
+          parent.postMessage({type: 'Failure', result: e.name}, '*');
         }
       });
       </script>
@@ -77,7 +85,7 @@ function resolve(specifier, parsedImportMap, baseURL) {
     window.addEventListener('message', event => {
         if (event.data.type === 'ResolutionSuccess') {
           resolve(event.data.result);
-        } else if (event.data.type === 'ResolutionFailure') {
+        } else if (event.data.type === 'Failure') {
           if (event.data.result === 'TypeError') {
             reject(new TypeError());
           } else {
@@ -90,7 +98,21 @@ function resolve(specifier, parsedImportMap, baseURL) {
       {once: true});
 
     parsedImportMap.contentWindow.postMessage(
-        {specifier: specifier, baseURL: baseURL}, '*');
+        {action: "resolve", specifier: specifier, baseURL: baseURL}, '*');
+  });
+}
+
+// Returns a promise that is resolved with a serialized string of
+// a parsed import map JSON object.
+function getParsedImportMap(parsedImportMap) {
+  return new Promise((resolve, reject) => {
+    window.addEventListener('message', event => {
+        resolve(event.data.result);
+      },
+      {once: true});
+
+    parsedImportMap.contentWindow.postMessage(
+        {action: "getParsedImportMap"}, '*');
   });
 }
 
@@ -101,11 +123,27 @@ function assert_no_extra_properties(object, expectedProperties, description) {
   }
 }
 
+// Sort keys and then stringify for comparison.
+function stringifyImportMap(importMap) {
+  function getKeys(m) {
+    if (typeof m !== 'object')
+      return [];
+
+    let keys = [];
+    for (const key in m) {
+      keys.push(key);
+      keys = keys.concat(getKeys(m[key]));
+    }
+    return keys;
+  }
+  return JSON.stringify(importMap, getKeys(importMap).sort());
+}
+
 async function runTests(j) {
   const tests = j.tests;
   delete j.tests;
 
-  if (j.importMap) {
+  if (j.hasOwnProperty('importMap')) {
     assert_own_property(j, 'importMap');
     assert_own_property(j, 'importMapBaseURL');
     j.parsedImportMap = await parse(j.importMap, j.importMapBaseURL);
@@ -115,7 +153,8 @@ async function runTests(j) {
 
   assert_no_extra_properties(
       j,
-      ['expectedResults', 'baseURL', 'name', 'parsedImportMap',
+      ['expectedResults', 'expectedParsedImportMap',
+      'baseURL', 'name', 'parsedImportMap',
       'importMap', 'importMapBaseURL',
       'link', 'details'],
       j.name);
@@ -133,26 +172,51 @@ async function runTests(j) {
     }
   } else {
     // Leaf node.
-    for (const key of
-        ['expectedResults', 'parsedImportMap', 'baseURL', 'name']) {
+    for (const key of ['parsedImportMap', 'name']) {
       assert_own_property(j, key, j.name);
     }
+    assert_true(j.hasOwnProperty('expectedResults') ||
+                j.hasOwnProperty('expectedParsedImportMap'),
+                'expectedResults or expectedParsedImportMap should exist');
+
+    // Resolution tests.
+    if (j.hasOwnProperty('expectedResults')) {
+      assert_own_property(j, 'baseURL');
+      assert_equals(
+          j.parsedImportMap.parseImportMapResult,
+          "Success",
+          "Import map registration should be successful for resolution tests");
+      for (const specifier in j.expectedResults) {
+        const expected = j.expectedResults[specifier];
+        promise_test(async t => {
+            if (expected === null) {
+              return promise_rejects(t, new TypeError(),
+                  resolve(specifier, j.parsedImportMap, j.baseURL));
+            } else {
+              // Should be resolved to `expected`.
+              const actual = await resolve(
+                  specifier, j.parsedImportMap, j.baseURL);
+              assert_equals(actual, expected);
+            }
+          },
+          j.name + ': ' + specifier);
+      }
+    }
 
-    for (const specifier in j.expectedResults) {
-      const expected = j.expectedResults[specifier];
+    // Parsing tests.
+    if (j.hasOwnProperty('expectedParsedImportMap')) {
       promise_test(async t => {
-          if (expected === null) {
-            return promise_rejects(t, new TypeError(),
-                resolve(specifier, j.parsedImportMap, j.baseURL));
-          } else {
-            // Should be resolved to `expected`.
-            const actual = await resolve(
-                specifier, j.parsedImportMap, j.baseURL);
-            assert_equals(actual, expected);
-          }
-        },
-        j.name + ': ' + specifier);
+        if (j.expectedParsedImportMap === null) {
+          assert_equals(j.parsedImportMap.parseImportMapResult, "ParseError");
+        } else {
+          const actualParsedImportMap =
+              await getParsedImportMap(j.parsedImportMap);
+          assert_equals(stringifyImportMap(JSON.parse(actualParsedImportMap)),
+                        stringifyImportMap(j.expectedParsedImportMap));
+        }
+      }, j.name);
     }
+
   }
 }
 
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-addresses-absolute.json b/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-addresses-absolute.json
new file mode 100644
index 00000000000..d392f8224fa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-addresses-absolute.json
@@ -0,0 +1,63 @@
+{
+  "name": "Absolute URL addresses",
+  "tests": {
+    "should only accept absolute URL addresses with fetch schemes": {
+      "importMap": {
+        "imports": {
+          "about": "about:good",
+          "blob": "blob:good",
+          "data": "data:good",
+          "file": "file:///good",
+          "filesystem": "filesystem:http://example.com/good/",
+          "http": "http://good/",
+          "https": "https://good/",
+          "ftp": "ftp://good/",
+          "import": "import:bad",
+          "mailto": "mailto:bad",
+          "javascript": "javascript:bad",
+          "wss": "wss:bad"
+        }
+      },
+      "importMapBaseURL": "https://base.example/path1/path2/path3",
+      "expectedParsedImportMap": {
+        "imports": {
+          "about": "about:good",
+          "blob": "blob:good",
+          "data": "data:good",
+          "file": "file:///good",
+          "filesystem": "filesystem:http://example.com/good/",
+          "http": "http://good/",
+          "https": "https://good/",
+          "ftp": "ftp://good/",
+          "import": "import:bad",
+          "javascript": "javascript:bad",
+          "mailto": "mailto:bad",
+          "wss": "wss://bad/"
+        },
+        "scopes": {}
+      }
+    },
+    "should parse absolute URLs, ignoring unparseable ones": {
+      "importMap": {
+        "imports": {
+          "unparseable2": "https://example.com:demo",
+          "unparseable3": "http://[www.example.com]/",
+          "invalidButParseable1": "https:example.org",
+          "invalidButParseable2": "https://///example.com///",
+          "prettyNormal": "https://example.net",
+          "percentDecoding": "https://ex%41mple.com/"
+        }
+      },
+      "importMapBaseURL": "https://base.example/path1/path2/path3",
+      "expectedParsedImportMap": {
+        "imports": {
+          "invalidButParseable1": "https://example.org/",
+          "invalidButParseable2": "https://example.com///",
+          "prettyNormal": "https://example.net/",
+          "percentDecoding": "https://example.com/"
+        },
+        "scopes": {}
+      }
+    }
+  }
+}
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-addresses-invalid.json b/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-addresses-invalid.json
new file mode 100644
index 00000000000..7d6502a1bc4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-addresses-invalid.json
@@ -0,0 +1,21 @@
+{
+  "name": "Other invalid addresses",
+  "tests": {
+    "should ignore unprefixed strings that are not absolute URLs": {
+      "importMap": {
+        "imports": {
+          "foo1": "bar",
+          "foo2": "\\bar",
+          "foo3": "~bar",
+          "foo4": "#bar",
+          "foo5": "?bar"
+        }
+      },
+      "importMapBaseURL": "https://base.example/path1/path2/path3",
+      "expectedParsedImportMap": {
+        "imports": {},
+        "scopes": {}
+      }
+    }
+  }
+}
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-addresses.json b/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-addresses.json
new file mode 100644
index 00000000000..d5bb54f0c80
--- /dev/null
+++ b/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-addresses.json
@@ -0,0 +1,73 @@
+{
+  "name": "Relative URL-like addresses",
+  "tests": {
+    "should accept strings prefixed with ./, ../, or /": {
+      "importMap": {
+        "imports": {
+          "dotSlash": "./foo",
+          "dotDotSlash": "../foo",
+          "slash": "/foo"
+        }
+      },
+      "importMapBaseURL": "https://base.example/path1/path2/path3",
+      "expectedParsedImportMap": {
+        "imports": {
+          "dotSlash": "https://base.example/path1/path2/foo",
+          "dotDotSlash": "https://base.example/path1/foo",
+          "slash": "https://base.example/foo"
+        },
+        "scopes": {}
+      }
+    },
+    "should not accept strings prefixed with ./, ../, or / for data: base URLs": {
+      "importMap": {
+        "imports": {
+          "dotSlash": "./foo",
+          "dotDotSlash": "../foo",
+          "slash": "/foo"
+        }
+      },
+      "importMapBaseURL": "data:text/html,test",
+      "expectedParsedImportMap": {
+        "imports": {},
+        "scopes": {}
+      }
+    },
+    "should accept the literal strings ./, ../, or / with no suffix": {
+      "importMap": {
+        "imports": {
+          "dotSlash": "./",
+          "dotDotSlash": "../",
+          "slash": "/"
+        }
+      },
+      "importMapBaseURL": "https://base.example/path1/path2/path3",
+      "expectedParsedImportMap": {
+        "imports": {
+          "dotSlash": "https://base.example/path1/path2/",
+          "dotDotSlash": "https://base.example/path1/",
+          "slash": "https://base.example/"
+        },
+        "scopes": {}
+      }
+    },
+    "should ignore percent-encoded variants of ./, ../, or /": {
+      "importMap": {
+        "imports": {
+          "dotSlash1": "%2E/",
+          "dotDotSlash1": "%2E%2E/",
+          "dotSlash2": ".%2F",
+          "dotDotSlash2": "..%2F",
+          "slash2": "%2F",
+          "dotSlash3": "%2E%2F",
+          "dotDotSlash3": "%2E%2E%2F"
+        }
+      },
+      "importMapBaseURL": "https://base.example/path1/path2/path3",
+      "expectedParsedImportMap": {
+        "imports": {},
+        "scopes": {}
+      }
+    }
+  }
+}
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-invalid-json.json b/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-invalid-json.json
new file mode 100644
index 00000000000..1bd1c94e894
--- /dev/null
+++ b/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-invalid-json.json
@@ -0,0 +1,6 @@
+{
+  "name": "Invalid JSON",
+  "importMapBaseURL": "https://base.example/",
+  "importMap": "{imports: {}}",
+  "expectedParsedImportMap": null
+}
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-schema-normalization.json b/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-schema-normalization.json
new file mode 100644
index 00000000000..a330bb8799b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-schema-normalization.json
@@ -0,0 +1,31 @@
+{
+  "name": "Normalization",
+  "importMapBaseURL": "https://base.example/",
+  "tests": {
+    "should normalize empty import maps to have imports and scopes keys": {
+      "importMap": {},
+      "expectedParsedImportMap": {
+        "imports": {},
+        "scopes": {}
+      }
+    },
+    "should normalize an import map without imports to have imports": {
+      "importMap": {
+        "scopes": {}
+      },
+      "expectedParsedImportMap": {
+        "imports": {},
+        "scopes": {}
+      }
+    },
+    "should normalize an import map without scopes to have scopes": {
+      "importMap": {
+        "imports": {}
+      },
+      "expectedParsedImportMap": {
+        "imports": {},
+        "scopes": {}
+      }
+    }
+  }
+}
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-schema-scope.json b/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-schema-scope.json
new file mode 100644
index 00000000000..04d09395c32
--- /dev/null
+++ b/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-schema-scope.json
@@ -0,0 +1,46 @@
+{
+  "name": "Mismatching scopes schema",
+  "importMapBaseURL": "https://base.example/",
+  "tests": {
+    "should throw if a scope's value is not an object": {
+      "expectedParsedImportMap": null,
+      "tests": {
+        "null": {
+          "importMap": {
+            "scopes": {
+              "https://example.com/": null
+            }
+          }
+        },
+        "boolean": {
+          "importMap": {
+            "scopes": {
+              "https://example.com/": true
+            }
+          }
+        },
+        "number": {
+          "importMap": {
+            "scopes": {
+              "https://example.com/": 1
+            }
+          }
+        },
+        "string": {
+          "importMap": {
+            "scopes": {
+              "https://example.com/": "foo"
+            }
+          }
+        },
+        "array": {
+          "importMap": {
+            "scopes": {
+              "https://example.com/": []
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-schema-specifier-map.json b/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-schema-specifier-map.json
new file mode 100644
index 00000000000..926e7a1f5f7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-schema-specifier-map.json
@@ -0,0 +1,38 @@
+{
+  "name": "Mismatching the specifier map schema",
+  "importMapBaseURL": "https://base.example/",
+  "tests": {
+    "should ignore entries where the address is not a string": {
+      "importMap": {
+        "imports": {
+          "null": null,
+          "boolean": true,
+          "number": 1,
+          "object": {},
+          "array": [],
+          "array2": [
+            "https://example.com/"
+          ],
+          "string": "https://example.com/"
+        }
+      },
+      "expectedParsedImportMap": {
+        "imports": {
+          "string": "https://example.com/"
+        },
+        "scopes": {}
+      }
+    },
+    "should ignore entries where the specifier key is an empty string": {
+      "importMap": {
+        "imports": {
+          "": "https://example.com/"
+        }
+      },
+      "expectedParsedImportMap": {
+        "imports": {},
+        "scopes": {}
+      }
+    }
+  }
+}
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-schema-toplevel.json b/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-schema-toplevel.json
new file mode 100644
index 00000000000..278cad2295c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-schema-toplevel.json
@@ -0,0 +1,97 @@
+{
+  "name": "Mismatching the top-level schema",
+  "importMapBaseURL": "https://base.example/",
+  "tests": {
+    "should throw for top-level non-objects": {
+      "expectedParsedImportMap": null,
+      "tests": {
+        "null": {
+          "importMap": null
+        },
+        "boolean": {
+          "importMap": true
+        },
+        "number": {
+          "importMap": 1
+        },
+        "string": {
+          "importMap": "foo"
+        },
+        "array": {
+          "importMap": []
+        }
+      }
+    },
+    "should throw if imports is a non-object": {
+      "expectedParsedImportMap": null,
+      "tests": {
+        "null": {
+          "importMap": {
+            "imports": null
+          }
+        },
+        "boolean": {
+          "importMap": {
+            "imports": true
+          }
+        },
+        "number": {
+          "importMap": {
+            "imports": 1
+          }
+        },
+        "string": {
+          "importMap": {
+            "imports": "foo"
+          }
+        },
+        "array": {
+          "importMap": {
+            "imports": []
+          }
+        }
+      }
+    },
+    "should throw if scopes is a non-object": {
+      "expectedParsedImportMap": null,
+      "tests": {
+        "null": {
+          "importMap": {
+            "scopes": null
+          }
+        },
+        "boolean": {
+          "importMap": {
+            "scopes": true
+          }
+        },
+        "number": {
+          "importMap": {
+            "scopes": 1
+          }
+        },
+        "string": {
+          "importMap": {
+            "scopes": "foo"
+          }
+        },
+        "array": {
+          "importMap": {
+            "scopes": []
+          }
+        }
+      }
+    },
+    "should ignore unspecified top-level entries": {
+      "importMap": {
+        "imports": {},
+        "new-feature": {},
+        "scops": {}
+      },
+      "expectedParsedImportMap": {
+        "imports": {},
+        "scopes": {}
+      }
+    }
+  }
+}
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-scope-keys.json b/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-scope-keys.json
new file mode 100644
index 00000000000..4b2f1eeada9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-scope-keys.json
@@ -0,0 +1,191 @@
+{
+  "importMapBaseURL": "https://base.example/path1/path2/path3",
+  "tests": {
+    "Relative URL scope keys should work with no prefix": {
+      "importMap": {
+        "scopes": {
+          "foo": {}
+        }
+      },
+      "expectedParsedImportMap": {
+        "imports": {},
+        "scopes": {
+          "https://base.example/path1/path2/foo": {}
+        }
+      }
+    },
+    "Relative URL scope keys should work with ./, ../, and / prefixes": {
+      "importMap": {
+        "scopes": {
+          "./foo": {},
+          "../foo": {},
+          "/foo": {}
+        }
+      },
+      "expectedParsedImportMap": {
+        "imports": {},
+        "scopes": {
+          "https://base.example/path1/path2/foo": {},
+          "https://base.example/path1/foo": {},
+          "https://base.example/foo": {}
+        }
+      }
+    },
+    "Absolute URL scope keys should ignore relative URL scope keys when the base URL is a data: URL": {
+      "importMap": {
+        "scopes": {
+          "./foo": {},
+          "../foo": {},
+          "/foo": {}
+        }
+      },
+      "importMapBaseURL": "data:text/html,test",
+      "expectedParsedImportMap": {
+        "imports": {},
+        "scopes": {}
+      }
+    },
+    "Relative URL scope keys should work with ./, ../, or / with no suffix": {
+      "importMap": {
+        "scopes": {
+          "./": {},
+          "../": {},
+          "/": {}
+        }
+      },
+      "expectedParsedImportMap": {
+        "imports": {},
+        "scopes": {
+          "https://base.example/path1/path2/": {},
+          "https://base.example/path1/": {},
+          "https://base.example/": {}
+        }
+      }
+    },
+    "Relative URL scope keys should work with /s, ?s, and #s": {
+      "importMap": {
+        "scopes": {
+          "foo/bar?baz#qux": {}
+        }
+      },
+      "expectedParsedImportMap": {
+        "imports": {},
+        "scopes": {
+          "https://base.example/path1/path2/foo/bar?baz#qux": {}
+        }
+      }
+    },
+    "Relative URL scope keys should work with an empty string scope key": {
+      "importMap": {
+        "scopes": {
+          "": {}
+        }
+      },
+      "expectedParsedImportMap": {
+        "imports": {},
+        "scopes": {
+          "https://base.example/path1/path2/path3": {}
+        }
+      }
+    },
+    "Relative URL scope keys should work with / suffixes": {
+      "importMap": {
+        "scopes": {
+          "foo/": {},
+          "./foo/": {},
+          "../foo/": {},
+          "/foo/": {},
+          "/foo//": {}
+        }
+      },
+      "expectedParsedImportMap": {
+        "imports": {},
+        "scopes": {
+          "https://base.example/path1/path2/foo/": {},
+          "https://base.example/path1/foo/": {},
+          "https://base.example/foo/": {},
+          "https://base.example/foo//": {}
+        }
+      }
+    },
+    "Relative URL scope keys should deduplicate based on URL parsing rules": {
+      "importMap": {
+        "scopes": {
+          "foo/\\": {
+            "1": "./a"
+          },
+          "foo//": {
+            "2": "./b"
+          },
+          "foo\\\\": {
+            "3": "./c"
+          }
+        }
+      },
+      "expectedParsedImportMap": {
+        "imports": {},
+        "scopes": {
+          "https://base.example/path1/path2/foo//": {
+            "3": "https://base.example/path1/path2/c"
+          }
+        }
+      }
+    },
+    "Absolute URL scope keys should accept all absolute URL scope keys, with or without fetch schemes": {
+      "importMap": {
+        "scopes": {
+          "about:good": {},
+          "blob:good": {},
+          "data:good": {},
+          "file:///good": {},
+          "filesystem:http://example.com/good/": {},
+          "http://good/": {},
+          "https://good/": {},
+          "ftp://good/": {},
+          "import:bad": {},
+          "mailto:bad": {},
+          "javascript:bad": {},
+          "wss:ba": {}
+        }
+      },
+      "expectedParsedImportMap": {
+        "imports": {},
+        "scopes": {
+          "about:good": {},
+          "blob:good": {},
+          "data:good": {},
+          "file:///good": {},
+          "filesystem:http://example.com/good/": {},
+          "http://good/": {},
+          "https://good/": {},
+          "ftp://good/": {},
+          "import:bad": {},
+          "mailto:bad": {},
+          "javascript:bad": {},
+          "wss://ba/": {}
+        }
+      }
+    },
+    "Absolute URL scope keys should parse absolute URL scope keys, ignoring unparseable ones": {
+      "importMap": {
+        "scopes": {
+          "https://example.com:demo": {},
+          "http://[www.example.com]/": {},
+          "https:example.org": {},
+          "https://///example.com///": {},
+          "https://example.net": {},
+          "https://ex%41mple.com/foo/": {}
+        }
+      },
+      "expectedParsedImportMap": {
+        "imports": {},
+        "scopes": {
+          "https://base.example/path1/path2/example.org": {},
+          "https://example.com///": {},
+          "https://example.net/": {},
+          "https://example.com/foo/": {}
+        }
+      }
+    }
+  }
+}
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-specifier-keys.json b/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-specifier-keys.json
new file mode 100644
index 00000000000..b2d9cf47fa0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-specifier-keys.json
@@ -0,0 +1,209 @@
+{
+  "importMapBaseURL": "https://base.example/path1/path2/path3",
+  "tests": {
+    "Relative URL specifier keys should absolutize strings prefixed with ./, ../, or / into the corresponding URLs": {
+      "importMap": {
+        "imports": {
+          "./foo": "/dotslash",
+          "../foo": "/dotdotslash",
+          "/foo": "/slash"
+        }
+      },
+      "expectedParsedImportMap": {
+        "imports": {
+          "https://base.example/path1/path2/foo": "https://base.example/dotslash",
+          "https://base.example/path1/foo": "https://base.example/dotdotslash",
+          "https://base.example/foo": "https://base.example/slash"
+        },
+        "scopes": {}
+      }
+    },
+    "Relative URL specifier keys should not absolutize strings prefixed with ./, ../, or / with a data: URL base": {
+      "importMap": {
+        "imports": {
+          "./foo": "https://example.com/dotslash",
+          "../foo": "https://example.com/dotdotslash",
+          "/foo": "https://example.com/slash"
+        }
+      },
+      "importMapBaseURL": "data:text/html,",
+      "expectedParsedImportMap": {
+        "imports": {
+          "./foo": "https://example.com/dotslash",
+          "../foo": "https://example.com/dotdotslash",
+          "/foo": "https://example.com/slash"
+        },
+        "scopes": {}
+      }
+    },
+    "Relative URL specifier keys should absolutize the literal strings ./, ../, or / with no suffix": {
+      "importMap": {
+        "imports": {
+          "./": "/dotslash/",
+          "../": "/dotdotslash/",
+          "/": "/slash/"
+        }
+      },
+      "expectedParsedImportMap": {
+        "imports": {
+          "https://base.example/path1/path2/": "https://base.example/dotslash/",
+          "https://base.example/path1/": "https://base.example/dotdotslash/",
+          "https://base.example/": "https://base.example/slash/"
+        },
+        "scopes": {}
+      }
+    },
+    "Relative URL specifier keys should work with /s, ?s, and #s": {
+      "importMap": {
+        "imports": {
+          "./foo/bar?baz#qux": "/foo"
+        }
+      },
+      "expectedParsedImportMap": {
+        "imports": {
+          "https://base.example/path1/path2/foo/bar?baz#qux": "https://base.example/foo"
+        },
+        "scopes": {}
+      }
+    },
+    "Relative URL specifier keys should ignore an empty string key": {
+      "importMap": {
+        "imports": {
+          "": "/foo"
+        }
+      },
+      "expectedParsedImportMap": {
+        "imports": {},
+        "scopes": {}
+      }
+    },
+    "Relative URL specifier keys should treat percent-encoded variants of ./, ../, or / as bare specifiers": {
+      "importMap": {
+        "imports": {
+          "%2E/": "/dotSlash1/",
+          "%2E%2E/": "/dotDotSlash1/",
+          ".%2F": "/dotSlash2",
+          "..%2F": "/dotDotSlash2",
+          "%2F": "/slash2",
+          "%2E%2F": "/dotSlash3",
+          "%2E%2E%2F": "/dotDotSlash3"
+        }
+      },
+      "expectedParsedImportMap": {
+        "imports": {
+          "%2E/": "https://base.example/dotSlash1/",
+          "%2E%2E/": "https://base.example/dotDotSlash1/",
+          ".%2F": "https://base.example/dotSlash2",
+          "..%2F": "https://base.example/dotDotSlash2",
+          "%2F": "https://base.example/slash2",
+          "%2E%2F": "https://base.example/dotSlash3",
+          "%2E%2E%2F": "https://base.example/dotDotSlash3"
+        },
+        "scopes": {}
+      }
+    },
+    "Relative URL specifier keys should deduplicate based on URL parsing rules": {
+      "importMap": {
+        "imports": {
+          "./foo/\\": "/foo1",
+          "./foo//": "/foo2",
+          "./foo\\\\": "/foo3"
+        }
+      },
+      "expectedParsedImportMap": {
+        "imports": {
+          "https://base.example/path1/path2/foo//": "https://base.example/foo3"
+        },
+        "scopes": {}
+      }
+    },
+    "Absolute URL specifier keys should accept all absolute URL specifier keys, with or without fetch schemes": {
+      "importMap": {
+        "imports": {
+          "about:good": "/about",
+          "blob:good": "/blob",
+          "data:good": "/data",
+          "file:///good": "/file",
+          "filesystem:http://example.com/good/": "/filesystem/",
+          "http://good/": "/http/",
+          "https://good/": "/https/",
+          "ftp://good/": "/ftp/",
+          "import:bad": "/import",
+          "mailto:bad": "/mailto",
+          "javascript:bad": "/javascript",
+          "wss:bad": "/wss"
+        }
+      },
+      "expectedParsedImportMap": {
+        "imports": {
+          "about:good": "https://base.example/about",
+          "blob:good": "https://base.example/blob",
+          "data:good": "https://base.example/data",
+          "file:///good": "https://base.example/file",
+          "filesystem:http://example.com/good/": "https://base.example/filesystem/",
+          "http://good/": "https://base.example/http/",
+          "https://good/": "https://base.example/https/",
+          "ftp://good/": "https://base.example/ftp/",
+          "import:bad": "https://base.example/import",
+          "mailto:bad": "https://base.example/mailto",
+          "javascript:bad": "https://base.example/javascript",
+          "wss://bad/": "https://base.example/wss"
+        },
+        "scopes": {}
+      }
+    },
+    "Absolute URL specifier keys should parse absolute URLs, treating unparseable ones as bare specifiers": {
+      "importMap": {
+        "imports": {
+          "https://example.com:demo": "/unparseable2",
+          "http://[www.example.com]/": "/unparseable3/",
+          "https:example.org": "/invalidButParseable1/",
+          "https://///example.com///": "/invalidButParseable2/",
+          "https://example.net": "/prettyNormal/",
+          "https://ex%41mple.com/": "/percentDecoding/"
+        }
+      },
+      "expectedParsedImportMap": {
+        "imports": {
+          "https://example.com:demo": "https://base.example/unparseable2",
+          "http://[www.example.com]/": "https://base.example/unparseable3/",
+          "https://example.org/": "https://base.example/invalidButParseable1/",
+          "https://example.com///": "https://base.example/invalidButParseable2/",
+          "https://example.net/": "https://base.example/prettyNormal/",
+          "https://example.com/": "https://base.example/percentDecoding/"
+        },
+        "scopes": {}
+      }
+    },
+    "Specifier keys should be sort correctly (issue #181) - Test #1": {
+      "importMap": {
+        "imports": {
+          "https://example.com/aaa": "https://example.com/aaa",
+          "https://example.com/a": "https://example.com/a"
+        }
+      },
+      "expectedParsedImportMap": {
+        "imports": {
+          "https://example.com/aaa": "https://example.com/aaa",
+          "https://example.com/a": "https://example.com/a"
+        },
+        "scopes": {}
+      }
+    },
+    "Specifier keys should be sort correctly (issue #181) - Test #2": {
+      "importMap": {
+        "imports": {
+          "https://example.com/a": "https://example.com/a",
+          "https://example.com/aaa": "https://example.com/aaa"
+        }
+      },
+      "expectedParsedImportMap": {
+        "imports": {
+          "https://example.com/aaa": "https://example.com/aaa",
+          "https://example.com/a": "https://example.com/a"
+        },
+        "scopes": {}
+      }
+    }
+  }
+}
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-trailing-slashes.json b/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-trailing-slashes.json
new file mode 100644
index 00000000000..21e5faa13ec
--- /dev/null
+++ b/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-trailing-slashes.json
@@ -0,0 +1,13 @@
+{
+  "name": "Failing addresses: mismatched trailing slashes",
+  "importMap": {
+    "imports": {
+      "trailer/": "/notrailer"
+    }
+  },
+  "importMapBaseURL": "https://base.example/path1/path2/path3",
+  "expectedParsedImportMap": {
+    "imports": {},
+    "scopes": {}
+  }
+}
diff --git a/tests/wpt/web-platform-tests/import-maps/imported/parsing-addresses.tentative.html b/tests/wpt/web-platform-tests/import-maps/imported/parsing-addresses.tentative.html
deleted file mode 100644
index ddb3b724bb6..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/imported/parsing-addresses.tentative.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../resources/jest-test-helper.js"></script>
-<script type="module" src="resources/helpers/parsing.js"></script>
-
-<!--
-Imported from https://github.com/WICG/import-maps/blob/master/reference-implementation/__tests__/parsing-addresses.js
--->
-<script type="module" src="resources/parsing-addresses.js"></script>
diff --git a/tests/wpt/web-platform-tests/import-maps/imported/parsing-schema.tentative.html b/tests/wpt/web-platform-tests/import-maps/imported/parsing-schema.tentative.html
deleted file mode 100644
index 6b7c0e5b0eb..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/imported/parsing-schema.tentative.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../resources/jest-test-helper.js"></script>
-<script type="module" src="resources/helpers/parsing.js"></script>
-
-<!--
-Imported from https://github.com/WICG/import-maps/blob/master/reference-implementation/__tests__/parsing-schema.js
--->
-<script type="module" src="resources/parsing-schema.js"></script>
diff --git a/tests/wpt/web-platform-tests/import-maps/imported/parsing-scope-keys.tentative.html b/tests/wpt/web-platform-tests/import-maps/imported/parsing-scope-keys.tentative.html
deleted file mode 100644
index 601ac37720d..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/imported/parsing-scope-keys.tentative.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../resources/jest-test-helper.js"></script>
-<script type="module" src="resources/helpers/parsing.js"></script>
-
-<!--
-Imported from https://github.com/WICG/import-maps/blob/master/reference-implementation/__tests__/parsing-scope-keys.js
--->
-<script type="module" src="resources/parsing-scope-keys.js"></script>
diff --git a/tests/wpt/web-platform-tests/import-maps/imported/parsing-specifier-keys.tentative.html b/tests/wpt/web-platform-tests/import-maps/imported/parsing-specifier-keys.tentative.html
deleted file mode 100644
index dd547f01d1d..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/imported/parsing-specifier-keys.tentative.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../resources/jest-test-helper.js"></script>
-<script type="module" src="resources/helpers/parsing.js"></script>
-
-<!--
-Imported from https://github.com/WICG/import-maps/blob/master/reference-implementation/__tests__/parsing-specifier-keys.js
--->
-<script type="module" src="resources/parsing-specifier-keys.js"></script>
diff --git a/tests/wpt/web-platform-tests/import-maps/imported/resources/helpers/parsing.js b/tests/wpt/web-platform-tests/import-maps/imported/resources/helpers/parsing.js
deleted file mode 100644
index daad6d26d22..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/imported/resources/helpers/parsing.js
+++ /dev/null
@@ -1,44 +0,0 @@
-'use strict';
-const { parseFromString } = require('../../lib/parser.js');
-
-// Local modifications from upstream:
-// Currently warnings and scopes are not checked in expectSpecifierMap().
-exports.expectSpecifierMap = (input, baseURL, output, warnings = []) => {
-  expect(parseFromString(`{ "imports": ${input} }`, baseURL))
-    .toEqual({ imports: output, scopes: {} });
-};
-
-exports.expectScopes = (inputArray, baseURL, outputArray, warnings = []) => {
-  const checkWarnings = testWarningHandler(warnings);
-
-  const inputScopesAsStrings = inputArray.map(scopePrefix => `${JSON.stringify(scopePrefix)}: {}`);
-  const inputString = `{ "scopes": { ${inputScopesAsStrings.join(', ')} } }`;
-
-  const outputScopesObject = {};
-  for (const outputScopePrefix of outputArray) {
-    outputScopesObject[outputScopePrefix] = {};
-  }
-
-  expect(parseFromString(inputString, baseURL)).toEqual({ imports: {}, scopes: outputScopesObject });
-
-  checkWarnings();
-};
-
-exports.expectBad = (input, baseURL, warnings = []) => {
-  const checkWarnings = testWarningHandler(warnings);
-  expect(() => parseFromString(input, baseURL)).toThrow(TypeError);
-  checkWarnings();
-};
-
-exports.expectWarnings = (input, baseURL, output, warnings = []) => {
-  const checkWarnings = testWarningHandler(warnings);
-  expect(parseFromString(input, baseURL)).toEqual(output);
-
-  checkWarnings();
-};
-
-function testWarningHandler(expectedWarnings) {
-  // We don't check warnings on WPT tests, because there are no
-  // ways to catch console warnings from JavaScript.
-  return () => {};
-}
diff --git a/tests/wpt/web-platform-tests/import-maps/imported/resources/parsing-addresses.js b/tests/wpt/web-platform-tests/import-maps/imported/resources/parsing-addresses.js
deleted file mode 100644
index 92d7714ade9..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/imported/resources/parsing-addresses.js
+++ /dev/null
@@ -1,175 +0,0 @@
-'use strict';
-const { expectSpecifierMap } = require('./helpers/parsing.js');
-
-describe('Relative URL-like addresses', () => {
-  it('should accept strings prefixed with ./, ../, or /', () => {
-    expectSpecifierMap(
-      `{
-        "dotSlash": "./foo",
-        "dotDotSlash": "../foo",
-        "slash": "/foo"
-      }`,
-      'https://base.example/path1/path2/path3',
-      {
-        dotSlash: expect.toMatchURL('https://base.example/path1/path2/foo'),
-        dotDotSlash: expect.toMatchURL('https://base.example/path1/foo'),
-        slash: expect.toMatchURL('https://base.example/foo')
-      }
-    );
-  });
-
-  it('should not accept strings prefixed with ./, ../, or / for data: base URLs', () => {
-    expectSpecifierMap(
-      `{
-        "dotSlash": "./foo",
-        "dotDotSlash": "../foo",
-        "slash": "/foo"
-      }`,
-      'data:text/html,test',
-      {
-      },
-      [
-        `Invalid address "./foo" for the specifier key "dotSlash".`,
-        `Invalid address "../foo" for the specifier key "dotDotSlash".`,
-        `Invalid address "/foo" for the specifier key "slash".`
-      ]
-    );
-  });
-
-  it('should accept the literal strings ./, ../, or / with no suffix', () => {
-    expectSpecifierMap(
-      `{
-        "dotSlash": "./",
-        "dotDotSlash": "../",
-        "slash": "/"
-      }`,
-      'https://base.example/path1/path2/path3',
-      {
-        dotSlash: expect.toMatchURL('https://base.example/path1/path2/'),
-        dotDotSlash: expect.toMatchURL('https://base.example/path1/'),
-        slash: expect.toMatchURL('https://base.example/')
-      }
-    );
-  });
-
-  it('should ignore percent-encoded variants of ./, ../, or /', () => {
-    expectSpecifierMap(
-      `{
-        "dotSlash1": "%2E/",
-        "dotDotSlash1": "%2E%2E/",
-        "dotSlash2": ".%2F",
-        "dotDotSlash2": "..%2F",
-        "slash2": "%2F",
-        "dotSlash3": "%2E%2F",
-        "dotDotSlash3": "%2E%2E%2F"
-      }`,
-      'https://base.example/path1/path2/path3',
-      {
-      },
-      [
-        `Invalid address "%2E/" for the specifier key "dotSlash1".`,
-        `Invalid address "%2E%2E/" for the specifier key "dotDotSlash1".`,
-        `Invalid address ".%2F" for the specifier key "dotSlash2".`,
-        `Invalid address "..%2F" for the specifier key "dotDotSlash2".`,
-        `Invalid address "%2F" for the specifier key "slash2".`,
-        `Invalid address "%2E%2F" for the specifier key "dotSlash3".`,
-        `Invalid address "%2E%2E%2F" for the specifier key "dotDotSlash3".`
-      ]
-    );
-  });
-});
-
-describe('Absolute URL addresses', () => {
-  it('should only accept absolute URL addresses with fetch schemes', () => {
-    expectSpecifierMap(
-      `{
-        "about": "about:good",
-        "blob": "blob:good",
-        "data": "data:good",
-        "file": "file:///good",
-        "filesystem": "filesystem:http://example.com/good/",
-        "http": "http://good/",
-        "https": "https://good/",
-        "ftp": "ftp://good/",
-        "import": "import:bad",
-        "mailto": "mailto:bad",
-        "javascript": "javascript:bad",
-        "wss": "wss:bad"
-      }`,
-      'https://base.example/path1/path2/path3',
-      {
-        about: expect.toMatchURL('about:good'),
-        blob: expect.toMatchURL('blob:good'),
-        data: expect.toMatchURL('data:good'),
-        file: expect.toMatchURL('file:///good'),
-        filesystem: expect.toMatchURL('filesystem:http://example.com/good/'),
-        http: expect.toMatchURL('http://good/'),
-        https: expect.toMatchURL('https://good/'),
-        ftp: expect.toMatchURL('ftp://good/'),
-        import: expect.toMatchURL('import:bad'),
-        javascript: expect.toMatchURL('javascript:bad'),
-        mailto: expect.toMatchURL('mailto:bad'),
-        wss: expect.toMatchURL('wss://bad/')
-      },
-      []
-    );
-  });
-
-  it('should parse absolute URLs, ignoring unparseable ones', () => {
-    expectSpecifierMap(
-      `{
-        "unparseable1": "https://ex ample.org/",
-        "unparseable2": "https://example.com:demo",
-        "unparseable3": "http://[www.example.com]/",
-        "invalidButParseable1": "https:example.org",
-        "invalidButParseable2": "https://///example.com///",
-        "prettyNormal": "https://example.net",
-        "percentDecoding": "https://ex%41mple.com/",
-        "noPercentDecoding": "https://example.com/%41"
-      }`,
-      'https://base.example/path1/path2/path3',
-      {
-        invalidButParseable1: expect.toMatchURL('https://example.org/'),
-        invalidButParseable2: expect.toMatchURL('https://example.com///'),
-        prettyNormal: expect.toMatchURL('https://example.net/'),
-        percentDecoding: expect.toMatchURL('https://example.com/'),
-        noPercentDecoding: expect.toMatchURL('https://example.com/%41')
-      },
-      [
-        `Invalid address "https://ex ample.org/" for the specifier key "unparseable1".`,
-        `Invalid address "https://example.com:demo" for the specifier key "unparseable2".`,
-        `Invalid address "http://[www.example.com]/" for the specifier key "unparseable3".`
-      ]
-    );
-  });
-});
-
-describe('Failing addresses: mismatched trailing slashes', () => {
-  it('should warn for the simple case', () => {
-    expectSpecifierMap(
-      `{
-        "trailer/": "/notrailer"
-      }`,
-      'https://base.example/path1/path2/path3',
-      {
-      },
-      [`Invalid address "https://base.example/notrailer" for package specifier key "trailer/". Package addresses must end with "/".`]
-    );
-  });
-});
-
-describe('Other invalid addresses', () => {
-  it('should ignore unprefixed strings that are not absolute URLs', () => {
-    for (const bad of ['bar', '\\bar', '~bar', '#bar', '?bar']) {
-      expectSpecifierMap(
-        `{
-          "foo": ${JSON.stringify(bad)}
-        }`,
-        'https://base.example/path1/path2/path3',
-        {
-        },
-        [`Invalid address "${bad}" for the specifier key "foo".`]
-      );
-    }
-  });
-});
diff --git a/tests/wpt/web-platform-tests/import-maps/imported/resources/parsing-schema.js b/tests/wpt/web-platform-tests/import-maps/imported/resources/parsing-schema.js
deleted file mode 100644
index f60422ae62b..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/imported/resources/parsing-schema.js
+++ /dev/null
@@ -1,99 +0,0 @@
-'use strict';
-const { parseFromString } = require('../lib/parser.js');
-const { expectBad, expectWarnings, expectSpecifierMap } = require('./helpers/parsing.js');
-
-const nonObjectStrings = ['null', 'true', '1', '"foo"', '[]'];
-
-test('Invalid JSON', () => {
-  expect(() => parseFromString('{ imports: {} }', 'https://base.example/')).toThrow(SyntaxError);
-});
-
-describe('Mismatching the top-level schema', () => {
-  it('should throw for top-level non-objects', () => {
-    for (const nonObject of nonObjectStrings) {
-      expectBad(nonObject, 'https://base.example/');
-    }
-  });
-
-  it('should throw if imports is a non-object', () => {
-    for (const nonObject of nonObjectStrings) {
-      expectBad(`{ "imports": ${nonObject} }`, 'https://base.example/');
-    }
-  });
-
-  it('should throw if scopes is a non-object', () => {
-    for (const nonObject of nonObjectStrings) {
-      expectBad(`{ "scopes": ${nonObject} }`, 'https://base.example/');
-    }
-  });
-
-  it('should ignore unspecified top-level entries', () => {
-    expectWarnings(
-      `{
-        "imports": {},
-        "new-feature": {},
-        "scops": {}
-      }`,
-      'https://base.example/',
-      { imports: {}, scopes: {} },
-      [
-        `Invalid top-level key "new-feature". Only "imports" and "scopes" can be present.`,
-        `Invalid top-level key "scops". Only "imports" and "scopes" can be present.`
-      ]
-    );
-  });
-});
-
-describe('Mismatching the specifier map schema', () => {
-  const invalidAddressStrings = ['null', 'true', '1', '{}', '[]', '["https://example.com/"]'];
-
-  it('should ignore entries where the address is not a string', () => {
-    for (const invalid of invalidAddressStrings) {
-      expectSpecifierMap(
-        `{
-          "foo": ${invalid},
-          "bar": "https://example.com/"
-        }`,
-        'https://base.example/',
-        {
-          bar: expect.toMatchURL('https://example.com/')
-        },
-        [`Invalid address ${invalid} for the specifier key "foo". Addresses must be strings.`]
-      );
-    }
-  });
-
-  it('should ignore entries where the specifier key is an empty string', () => {
-    expectSpecifierMap(
-      `{
-        "": "https://example.com/"
-      }`,
-      'https://base.example/',
-      {},
-      [`Invalid empty string specifier key.`]
-    );
-  });
-
-  it('should throw if a scope\'s value is not an object', () => {
-    for (const invalid of nonObjectStrings) {
-      expectBad(`{ "scopes": { "https://scope.example/": ${invalid} } }`, 'https://base.example/');
-    }
-  });
-});
-
-describe('Normalization', () => {
-  it('should normalize empty import maps to have imports and scopes keys', () => {
-    expect(parseFromString(`{}`, 'https://base.example/'))
-      .toEqual({ imports: {}, scopes: {} });
-  });
-
-  it('should normalize an import map without imports to have imports', () => {
-    expect(parseFromString(`{ "scopes": {} }`, 'https://base.example/'))
-      .toEqual({ imports: {}, scopes: {} });
-  });
-
-  it('should normalize an import map without scopes to have scopes', () => {
-    expect(parseFromString(`{ "imports": {} }`, 'https://base.example/'))
-      .toEqual({ imports: {}, scopes: {} });
-  });
-});
diff --git a/tests/wpt/web-platform-tests/import-maps/imported/resources/parsing-scope-keys.js b/tests/wpt/web-platform-tests/import-maps/imported/resources/parsing-scope-keys.js
deleted file mode 100644
index 4993f3a9a8b..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/imported/resources/parsing-scope-keys.js
+++ /dev/null
@@ -1,144 +0,0 @@
-'use strict';
-const { expectScopes } = require('./helpers/parsing.js');
-
-describe('Relative URL scope keys', () => {
-  it('should work with no prefix', () => {
-    expectScopes(
-      ['foo'],
-      'https://base.example/path1/path2/path3',
-      ['https://base.example/path1/path2/foo']
-    );
-  });
-
-  it('should work with ./, ../, and / prefixes', () => {
-    expectScopes(
-      ['./foo', '../foo', '/foo'],
-      'https://base.example/path1/path2/path3',
-      [
-        'https://base.example/path1/path2/foo',
-        'https://base.example/path1/foo',
-        'https://base.example/foo'
-      ]
-    );
-  });
-
-  it('should work with /s, ?s, and #s', () => {
-    expectScopes(
-      ['foo/bar?baz#qux'],
-      'https://base.example/path1/path2/path3',
-      ['https://base.example/path1/path2/foo/bar?baz#qux']
-    );
-  });
-
-  it('should work with an empty string scope key', () => {
-    expectScopes(
-      [''],
-      'https://base.example/path1/path2/path3',
-      ['https://base.example/path1/path2/path3']
-    );
-  });
-
-  it('should work with / suffixes', () => {
-    expectScopes(
-      ['foo/', './foo/', '../foo/', '/foo/', '/foo//'],
-      'https://base.example/path1/path2/path3',
-      [
-        'https://base.example/path1/path2/foo/',
-        'https://base.example/path1/path2/foo/',
-        'https://base.example/path1/foo/',
-        'https://base.example/foo/',
-        'https://base.example/foo//'
-      ]
-    );
-  });
-
-  it('should deduplicate based on URL parsing rules', () => {
-    expectScopes(
-      ['foo/\\', 'foo//', 'foo\\\\'],
-      'https://base.example/path1/path2/path3',
-      ['https://base.example/path1/path2/foo//']
-    );
-  });
-});
-
-describe('Absolute URL scope keys', () => {
-  it('should accept all absolute URL scope keys, with or without fetch schemes', () => {
-    expectScopes(
-      [
-        'about:good',
-        'blob:good',
-        'data:good',
-        'file:///good',
-        'filesystem:http://example.com/good/',
-        'http://good/',
-        'https://good/',
-        'ftp://good/',
-        'import:bad',
-        'mailto:bad',
-        'javascript:bad',
-        'wss:ba'
-      ],
-      'https://base.example/path1/path2/path3',
-      [
-        'about:good',
-        'blob:good',
-        'data:good',
-        'file:///good',
-        'filesystem:http://example.com/good/',
-        'http://good/',
-        'https://good/',
-        'ftp://good/',
-        'import:bad',
-        'mailto:bad',
-        'javascript:bad',
-        'wss://ba/'
-      ],
-      []
-    );
-  });
-
-  it('should parse absolute URL scope keys, ignoring unparseable ones', () => {
-    expectScopes(
-      [
-        'https://ex ample.org/',
-        'https://example.com:demo',
-        'http://[www.example.com]/',
-        'https:example.org',
-        'https://///example.com///',
-        'https://example.net',
-        'https://ex%41mple.com/foo/',
-        'https://example.com/%41'
-      ],
-      'https://base.example/path1/path2/path3',
-      [
-        'https://base.example/path1/path2/example.org', // tricky case! remember we have a base URL
-        'https://example.com///',
-        'https://example.net/',
-        'https://example.com/foo/',
-        'https://example.com/%41'
-      ],
-      [
-        'Invalid scope "https://ex ample.org/" (parsed against base URL "https://base.example/path1/path2/path3").',
-        'Invalid scope "https://example.com:demo" (parsed against base URL "https://base.example/path1/path2/path3").',
-        'Invalid scope "http://[www.example.com]/" (parsed against base URL "https://base.example/path1/path2/path3").'
-      ]
-    );
-  });
-
-  it('should ignore relative URL scope keys when the base URL is a data: URL', () => {
-    expectScopes(
-      [
-        './foo',
-        '../foo',
-        '/foo'
-      ],
-      'data:text/html,test',
-      [],
-      [
-        'Invalid scope "./foo" (parsed against base URL "data:text/html,test").',
-        'Invalid scope "../foo" (parsed against base URL "data:text/html,test").',
-        'Invalid scope "/foo" (parsed against base URL "data:text/html,test").'
-      ]
-    );
-  });
-});
diff --git a/tests/wpt/web-platform-tests/import-maps/imported/resources/parsing-specifier-keys.js b/tests/wpt/web-platform-tests/import-maps/imported/resources/parsing-specifier-keys.js
deleted file mode 100644
index 7ac24bf867b..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/imported/resources/parsing-specifier-keys.js
+++ /dev/null
@@ -1,164 +0,0 @@
-'use strict';
-const { expectSpecifierMap } = require('./helpers/parsing.js');
-
-describe('Relative URL-like specifier keys', () => {
-  it('should absolutize strings prefixed with ./, ../, or / into the corresponding URLs', () => {
-    expectSpecifierMap(
-      `{
-        "./foo": "/dotslash",
-        "../foo": "/dotdotslash",
-        "/foo": "/slash"
-      }`,
-      'https://base.example/path1/path2/path3',
-      {
-        'https://base.example/path1/path2/foo': expect.toMatchURL('https://base.example/dotslash'),
-        'https://base.example/path1/foo': expect.toMatchURL('https://base.example/dotdotslash'),
-        'https://base.example/foo': expect.toMatchURL('https://base.example/slash')
-      }
-    );
-  });
-
-  it('should not absolutize strings prefixed with ./, ../, or / with a data: URL base', () => {
-    expectSpecifierMap(
-      `{
-        "./foo": "https://example.com/dotslash",
-        "../foo": "https://example.com/dotdotslash",
-        "/foo": "https://example.com/slash"
-      }`,
-      'data:text/html,test',
-      {
-        './foo': expect.toMatchURL('https://example.com/dotslash'),
-        '../foo': expect.toMatchURL('https://example.com/dotdotslash'),
-        '/foo': expect.toMatchURL('https://example.com/slash')
-      }
-    );
-  });
-
-  it('should absolutize the literal strings ./, ../, or / with no suffix', () => {
-    expectSpecifierMap(
-      `{
-        "./": "/dotslash/",
-        "../": "/dotdotslash/",
-        "/": "/slash/"
-      }`,
-      'https://base.example/path1/path2/path3',
-      {
-        'https://base.example/path1/path2/': expect.toMatchURL('https://base.example/dotslash/'),
-        'https://base.example/path1/': expect.toMatchURL('https://base.example/dotdotslash/'),
-        'https://base.example/': expect.toMatchURL('https://base.example/slash/')
-      }
-    );
-  });
-
-  it('should treat percent-encoded variants of ./, ../, or / as bare specifiers', () => {
-    expectSpecifierMap(
-      `{
-        "%2E/": "/dotSlash1/",
-        "%2E%2E/": "/dotDotSlash1/",
-        ".%2F": "/dotSlash2",
-        "..%2F": "/dotDotSlash2",
-        "%2F": "/slash2",
-        "%2E%2F": "/dotSlash3",
-        "%2E%2E%2F": "/dotDotSlash3"
-      }`,
-      'https://base.example/path1/path2/path3',
-      {
-        '%2E/': expect.toMatchURL('https://base.example/dotSlash1/'),
-        '%2E%2E/': expect.toMatchURL('https://base.example/dotDotSlash1/'),
-        '.%2F': expect.toMatchURL('https://base.example/dotSlash2'),
-        '..%2F': expect.toMatchURL('https://base.example/dotDotSlash2'),
-        '%2F': expect.toMatchURL('https://base.example/slash2'),
-        '%2E%2F': expect.toMatchURL('https://base.example/dotSlash3'),
-        '%2E%2E%2F': expect.toMatchURL('https://base.example/dotDotSlash3')
-      }
-    );
-  });
-});
-
-describe('Absolute URL specifier keys', () => {
-  it('Accept all absolute URL specifier keys even with fetch schemes as URLs', () => {
-    expectSpecifierMap(
-      `{
-        "about:good": "/about",
-        "blob:good": "/blob",
-        "data:good": "/data",
-        "file:///good": "/file",
-        "filesystem:http://example.com/good/": "/filesystem/",
-        "http://good/": "/http/",
-        "https://good/": "/https/",
-        "ftp://good/": "/ftp/",
-        "import:bad": "/import",
-        "mailto:bad": "/mailto",
-        "javascript:bad": "/javascript",
-        "wss:bad": "/wss"
-      }`,
-      'https://base.example/path1/path2/path3',
-      {
-        'about:good': expect.toMatchURL('https://base.example/about'),
-        'blob:good': expect.toMatchURL('https://base.example/blob'),
-        'data:good': expect.toMatchURL('https://base.example/data'),
-        'file:///good': expect.toMatchURL('https://base.example/file'),
-        'filesystem:http://example.com/good/': expect.toMatchURL('https://base.example/filesystem/'),
-        'http://good/': expect.toMatchURL('https://base.example/http/'),
-        'https://good/': expect.toMatchURL('https://base.example/https/'),
-        'ftp://good/': expect.toMatchURL('https://base.example/ftp/'),
-        'import:bad': expect.toMatchURL('https://base.example/import'),
-        'mailto:bad': expect.toMatchURL('https://base.example/mailto'),
-        'javascript:bad': expect.toMatchURL('https://base.example/javascript'),
-        'wss://bad/': expect.toMatchURL('https://base.example/wss')
-      }
-    );
-  });
-
-  it('should parse absolute URLs, treating unparseable ones as bare specifiers', () => {
-    expectSpecifierMap(
-      `{
-        "https://ex ample.org/": "/unparseable1/",
-        "https://example.com:demo": "/unparseable2",
-        "http://[www.example.com]/": "/unparseable3/",
-        "https:example.org": "/invalidButParseable1/",
-        "https://///example.com///": "/invalidButParseable2/",
-        "https://example.net": "/prettyNormal/",
-        "https://ex%41mple.com/": "/percentDecoding/",
-        "https://example.com/%41": "/noPercentDecoding"
-      }`,
-      'https://base.example/path1/path2/path3',
-      {
-        'https://ex ample.org/': expect.toMatchURL('https://base.example/unparseable1/'),
-        'https://example.com:demo': expect.toMatchURL('https://base.example/unparseable2'),
-        'http://[www.example.com]/': expect.toMatchURL('https://base.example/unparseable3/'),
-        'https://example.org/': expect.toMatchURL('https://base.example/invalidButParseable1/'),
-        'https://example.com///': expect.toMatchURL('https://base.example/invalidButParseable2/'),
-        'https://example.net/': expect.toMatchURL('https://base.example/prettyNormal/'),
-        'https://example.com/': expect.toMatchURL('https://base.example/percentDecoding/'),
-        'https://example.com/%41': expect.toMatchURL('https://base.example/noPercentDecoding')
-      }
-    );
-  });
-
-  it('should sort correctly (issue #181)', () => {
-    expectSpecifierMap(
-      `{
-        "https://example.com/aaa": "https://example.com/aaa",
-        "https://example.com/a": "https://example.com/a"
-      }`,
-      'https://base.example/',
-      {
-        'https://example.com/aaa': expect.toMatchURL('https://example.com/aaa'),
-        'https://example.com/a': expect.toMatchURL('https://example.com/a')
-      }
-    );
-
-    expectSpecifierMap(
-      `{
-        "https://example.com/a": "https://example.com/a",
-        "https://example.com/aaa": "https://example.com/aaa"
-      }`,
-      'https://base.example/',
-      {
-        'https://example.com/aaa': expect.toMatchURL('https://example.com/aaa'),
-        'https://example.com/a': expect.toMatchURL('https://example.com/a')
-      }
-    );
-  });
-});
diff --git a/tests/wpt/web-platform-tests/interfaces/dom.idl b/tests/wpt/web-platform-tests/interfaces/dom.idl
index f7a10d890ab..ad62c7a59c6 100644
--- a/tests/wpt/web-platform-tests/interfaces/dom.idl
+++ b/tests/wpt/web-platform-tests/interfaces/dom.idl
@@ -52,7 +52,7 @@ interface CustomEvent : Event {
 
   readonly attribute any detail;
 
-  void initCustomEvent(DOMString type, optional boolean bubbles = false, optional boolean cancelable = false, optional any detail = null);
+  void initCustomEvent(DOMString type, optional boolean bubbles = false, optional boolean cancelable = false, optional any detail = null); // historical
 };
 
 dictionary CustomEventInit : EventInit {
@@ -289,7 +289,7 @@ interface Document : Node {
   [NewObject] Attr createAttribute(DOMString localName);
   [NewObject] Attr createAttributeNS(DOMString? namespace, DOMString qualifiedName);
 
-  [NewObject] Event createEvent(DOMString interface);
+  [NewObject] Event createEvent(DOMString interface); // historical
 
   [NewObject] Range createRange();
 
diff --git a/tests/wpt/web-platform-tests/interfaces/wai-aria.idl b/tests/wpt/web-platform-tests/interfaces/wai-aria.idl
index 9cae4025d82..c4fbf11409c 100644
--- a/tests/wpt/web-platform-tests/interfaces/wai-aria.idl
+++ b/tests/wpt/web-platform-tests/interfaces/wai-aria.idl
@@ -21,7 +21,7 @@ interface mixin AriaAttributes {
   attribute FrozenArray<Element>? ariaControlsElements;
   attribute DOMString? ariaCurrent;
   attribute FrozenArray<Element>? ariaDescribedByElements;
-  attribute Element? ariaDetailsElements;
+  attribute Element? ariaDetailsElement;
   attribute DOMString? ariaDisabled;
   attribute Element? ariaErrorMessageElement;
   attribute DOMString? ariaExpanded;
diff --git a/tests/wpt/web-platform-tests/interfaces/webrtc-identity.idl b/tests/wpt/web-platform-tests/interfaces/webrtc-identity.idl
index d1f2a654760..28b6a3b2b7f 100644
--- a/tests/wpt/web-platform-tests/interfaces/webrtc-identity.idl
+++ b/tests/wpt/web-platform-tests/interfaces/webrtc-identity.idl
@@ -49,6 +49,10 @@ partial interface RTCPeerConnection {
     readonly        attribute DOMString?                    idpErrorInfo;
 };
 
+partial dictionary RTCConfiguration {
+    DOMString peerIdentity;
+};
+
 dictionary RTCIdentityProviderOptions {
     DOMString protocol = "default";
     DOMString usernameHint;
@@ -62,6 +66,29 @@ interface RTCIdentityAssertion {
     attribute DOMString name;
 };
 
+partial interface RTCError {
+  readonly attribute long? httpRequestStatusCode;
+};
+
+partial dictionary RTCErrorInit {
+  long httpRequestStatusCode;
+};
+
+// This is an extension of RTCErrorDetailType from [[WEBRTC-PC]]
+// Unfortunately, WebIDL does not support partial enums (yet).
+//
+// partial enum RTCErrorDetailType {
+enum RTCErrorDetailTypeIdp {
+  "idp-bad-script-failure",
+  "idp-execution-failure",
+  "idp-load-failure",
+  "idp-need-login",
+  "idp-timeout",
+  "idp-tls-failure",
+  "idp-token-expired",
+  "idp-token-invalid",
+};
+
 partial dictionary MediaStreamConstraints {
              DOMString peerIdentity;
 };
diff --git a/tests/wpt/web-platform-tests/interfaces/webrtc-stats.idl b/tests/wpt/web-platform-tests/interfaces/webrtc-stats.idl
index c5d00ac4462..d1a54898b9a 100644
--- a/tests/wpt/web-platform-tests/interfaces/webrtc-stats.idl
+++ b/tests/wpt/web-platform-tests/interfaces/webrtc-stats.idl
@@ -241,9 +241,6 @@ dictionary RTCVideoSenderStats : RTCVideoHandlerStats {
              DOMString           mediaSourceId;
 };
 
-dictionary RTCSenderVideoTrackAttachmentStats : RTCVideoSenderStats {
-};
-
 dictionary RTCVideoReceiverStats : RTCVideoHandlerStats {
 };
 
@@ -254,9 +251,6 @@ dictionary RTCAudioSenderStats : RTCAudioHandlerStats {
              DOMString           mediaSourceId;
 };
 
-dictionary RTCSenderAudioTrackAttachmentStats : RTCAudioSenderStats {
-};
-
 dictionary RTCAudioReceiverStats : RTCAudioHandlerStats {
 };
 
@@ -366,6 +360,12 @@ dictionary RTCMediaStreamStats : RTCStats {
   sequence<DOMString> trackIds;
 };
 
+dictionary RTCSenderVideoTrackAttachmentStats : RTCVideoSenderStats {
+};
+
+dictionary RTCSenderAudioTrackAttachmentStats : RTCAudioSenderStats {
+};
+
 dictionary RTCReceiverVideoTrackAttachmentStats : RTCVideoReceiverStats {};
 
 dictionary RTCReceiverAudioTrackAttachmentStats : RTCAudioReceiverStats {};
diff --git a/tests/wpt/web-platform-tests/lint.whitelist b/tests/wpt/web-platform-tests/lint.whitelist
index 425730feea7..1b102e4e03c 100644
--- a/tests/wpt/web-platform-tests/lint.whitelist
+++ b/tests/wpt/web-platform-tests/lint.whitelist
@@ -686,7 +686,7 @@ LAYOUTTESTS APIS: resources/chromium/nfc-mock.js
 LAYOUTTESTS APIS: resources/chromium/webxr-test.js
 LAYOUTTESTS APIS: web-nfc/NDEFReader-document-hidden-manual.https.html
 LAYOUTTESTS APIS: web-nfc/NDEFReader_scan.https.html
-LAYOUTTESTS APIS: web-nfc/NDEFWriter_push.https.html
+LAYOUTTESTS APIS: web-nfc/NDEFWriter_write.https.html
 
 # Signed Exchange files have hard-coded URLs in the certUrl field
 WEB-PLATFORM.TEST:signed-exchange/resources/*.sxg
diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/math-global-event-handlers.tentative.html b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/math-global-event-handlers.tentative.html
index d77aa57741c..7bbdee26110 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/math-global-event-handlers.tentative.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/math-global-event-handlers.tentative.html
@@ -10,6 +10,16 @@
 
 <script>
   "use strict";
+
+  // The prefixed animation events are special; their event types are
+  // camel-case.
+  const prefixedAnimationAttributeToEventType = new Map([
+    ["webkitanimationend", "webkitAnimationEnd"],
+    ["webkitanimationiteration", "webkitAnimationIteration"],
+    ["webkitanimationstart", "webkitAnimationStart"],
+    ["webkittransitionend", "webkitTransitionEnd"],
+  ]);
+
   setup({ explicit_done: true });
 
   // basic pattern lifted from /html/webappapis/scripting/events/event-handler-all-global-events.html
@@ -131,7 +141,11 @@
           );
           let target = undefined;
           element[name] = (e) => { target = e.currentTarget; }
-          element.dispatchEvent(new Event(withoutOn));
+          let eventType = withoutOn;
+          if (prefixedAnimationAttributeToEventType.has(eventType)) {
+            eventType = prefixedAnimationAttributeToEventType.get(eventType);
+          }
+          element.dispatchEvent(new Event(eventType));
           assert_equals(target, element, "The event must be fired at the <math> element");
         }, `${name}: dispatching an Event at a <math> element must trigger element.${name}`);
       }
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.keep-scheme.https.html
index 7c3ca228d79..e6549e0043a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.no-redirect.https.html
index fc39dbd181e..a5d9f205676 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.swap-scheme.https.html
index 7e4238e5675..284fe5316dc 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.keep-scheme.https.html
index 64bc8adb8d6..c95e54a13f5 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.no-redirect.https.html
index 9c47757780e..12e964d5243 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.swap-scheme.https.html
index a298e3f347f..8d2b49a4823 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-https.keep-scheme.https.html
index 7da3e5a2dde..c82f589246f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-https.no-redirect.https.html
index b1938717640..d475bbe0cf5 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.keep-scheme.https.html
index 2604c38b67f..0f4d641ff8f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.no-redirect.https.html
index 8a297d62c48..5be5db15548 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.swap-scheme.https.html
index a9bb4fe2853..3eefb62b4d1 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-http.keep-scheme.https.html
index 75d150dba77..984b353c92a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-http.no-redirect.https.html
index 8203cb7e1df..46234a71683 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-http.swap-scheme.https.html
index 54114ff754b..27b956ee0b2 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-https.keep-scheme.https.html
index 9a7cc113b33..52f3cb99ada 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-https.no-redirect.https.html
index 86c56bdfef5..303e047ba53 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html
index d98fee3b05f..ea9697785b3 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.no-redirect.https.html
index 6f111d12623..8a296455861 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html
index 0b35f8b6d90..c080c346ccb 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-http.keep-scheme.https.html
index b96a2125eb6..ea9c18d6a81 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-http.no-redirect.https.html
index 280a9cdc6b8..dfbd794400c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-http.swap-scheme.https.html
index a9063e42946..2e6296c483c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-https.keep-scheme.https.html
index 4e2f750fd1d..34f1b72647c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-https.no-redirect.https.html
index 74817ec7dae..71a29f3f2d4 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.keep-scheme.https.html
index 4418c78d336..58b9064284f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.no-redirect.https.html
index d2c26b92dcc..45b824720b5 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.swap-scheme.https.html
index 30ab7af050c..1a9e874ba75 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.keep-scheme.https.html
index 36191f7290b..459eb2c5eb8 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.no-redirect.https.html
index 8cdd95bf999..e49927264fd 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.swap-scheme.https.html
index 62a3562af1d..388e5312823 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-https.keep-scheme.https.html
index d8687bd8b6e..83297b91af3 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-https.no-redirect.https.html
index ffa2e47c8a1..951b0aa295e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.keep-scheme.https.html
index 7ee41857344..4ca29b6c059 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.no-redirect.https.html
index be00ef5d27d..edcf944a748 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.swap-scheme.https.html
index 9bed22b198f..c408c72d125 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.keep-scheme.https.html
index 3849927c9b3..6eabfab8234 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.no-redirect.https.html
index cdde11b1449..4f823de23e6 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.swap-scheme.https.html
index e9bcc9e6bf7..96a08a133b3 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-https.keep-scheme.https.html
index 493d92e34f9..8f3414e493f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-https.no-redirect.https.html
index 69ab08e8f30..b9b3a61d3cd 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.keep-scheme.https.html
index 30594cc7547..cd95c8c3aef 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.no-redirect.https.html
index 533309e93b3..a21b718800e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.swap-scheme.https.html
index 5f8ce108fc6..99483c30b02 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.keep-scheme.https.html
index 076ecb8328d..6020508010c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.no-redirect.https.html
index 534d3a13428..8b671426473 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.swap-scheme.https.html
index cd87071760b..29a0d46a8a5 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-https.keep-scheme.https.html
index 1f1b6d12361..0ba438eee6e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-https.no-redirect.https.html
index f8cf49fd07e..555c53485ec 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.keep-scheme.https.html
index de3c2cafe69..828db98e0db 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.no-redirect.https.html
index ee9625d31eb..1dace197dd2 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.swap-scheme.https.html
index ab0a387f7c5..30b3c5bb3cf 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.keep-scheme.https.html
index edbb3f9f2db..ec9eb5b8f2c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.no-redirect.https.html
index 72ae7e512a6..4fb39defdf9 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.swap-scheme.https.html
index fb969da6369..01676bab338 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-https.keep-scheme.https.html
index c537a645e00..ac1e8531154 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-https.no-redirect.https.html
index ea3e82ac9f4..e248122edeb 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.keep-scheme.https.html
index 6ad20e5a28b..6417081f9fe 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.no-redirect.https.html
index 533eb0ba8fb..2c3f9e1cbfa 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.swap-scheme.https.html
index 6c531f3cbcf..886e6ef82fd 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.keep-scheme.https.html
index d46d6f40430..75289034c92 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.no-redirect.https.html
index 981d6c5a2ad..52a421f7428 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.swap-scheme.https.html
index 68233cd9b21..26ed43eca37 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-https.keep-scheme.https.html
index e702aef5b02..6d10711d638 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-https.no-redirect.https.html
index b26d44db206..fe4da56e32a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.keep-scheme.https.html
index 727fc11dc38..a5f903c2fd2 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.no-redirect.https.html
index 9b416e87fb1..f3594a9c55c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.swap-scheme.https.html
index fd6c3be8ae3..1933b3753a2 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.keep-scheme.https.html
index 479be786348..bfc3391e7d4 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.no-redirect.https.html
index c32977196a9..712f802dc16 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.swap-scheme.https.html
index ba13e682fdb..c70728730d8 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-https.keep-scheme.https.html
index 01b37600dee..d58c20a049b 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-https.no-redirect.https.html
index 7d240ececc1..3d29665067f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.keep-scheme.https.html
index 8eca0a7179a..8c6b5a91248 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.no-redirect.https.html
index 1141ccae3e4..8663d092110 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.swap-scheme.https.html
index d926f5ec45c..89256a2715b 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.keep-scheme.https.html
index e82185a056c..00ad7103d12 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.no-redirect.https.html
index ed122925efe..da39ce62969 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.swap-scheme.https.html
index 5c5377d7f2f..d7b69eb82e3 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-https.keep-scheme.https.html
index 79b3c0a2848..89f1f67de62 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-https.no-redirect.https.html
index c2c7f8723c4..2860df22162 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.keep-scheme.https.html
index 18ec117f461..1c5302b12c4 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.no-redirect.https.html
index 1673464aae0..8437326b180 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.swap-scheme.https.html
index bd8d6fd7967..92fd464c93a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.keep-scheme.https.html
index b5080134174..ac11208f23e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.no-redirect.https.html
index 9f168b080fa..967445ee8d5 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.swap-scheme.https.html
index 24445374ae5..273712aad9b 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-wss.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-wss.keep-scheme.https.html
index b397c4e2a61..47619170144 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-wss.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-wss.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-wss.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-wss.no-redirect.https.html
index d19674db08c..ed5c0ab8a77 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-wss.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-wss.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.keep-scheme.https.html
index 85290c11b71..8a915c29f9f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.no-redirect.https.html
index 0e125bcd8be..5aabf759341 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.swap-scheme.https.html
index b92b11d0be8..90c204d7a0d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.keep-scheme.https.html
index 213cf96bb28..93668db49e4 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.no-redirect.https.html
index 5ec4866157a..8521e37281c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.swap-scheme.https.html
index c75044d4310..d5f79ad6021 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-https.keep-scheme.https.html
index 5c5d73b35e9..042bd14fa81 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-https.no-redirect.https.html
index 4aa31ce50e4..05b13b680a5 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.keep-scheme.https.html
index adba8778717..60963f90586 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.no-redirect.https.html
index 7b54a338fdf..7ced3b86cdb 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.swap-scheme.https.html
index 57d144abd75..15711a976bf 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.keep-scheme.https.html
index cb127cf1792..4a1d3766839 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.no-redirect.https.html
index 768fd4cce7f..b8c53bae221 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.swap-scheme.https.html
index 736f6bce379..be403a893c9 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-https.keep-scheme.https.html
index 5be23a03117..06a8f47ae42 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-https.no-redirect.https.html
index 858a1528043..211bd0d2998 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.keep-scheme.https.html
index a1e6f61e6b7..69dcfb7e5cb 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.no-redirect.https.html
index a95d2061b68..816e3449092 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.swap-scheme.https.html
index c396cdc20ba..9e167de1486 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.keep-scheme.https.html
index 20414a3dac3..75e103e6343 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.no-redirect.https.html
index 9397a3523e8..f9e963d8dc7 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.swap-scheme.https.html
index 0340366bdf2..f0397f11b69 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-https.keep-scheme.https.html
index da0e808f184..b81758e5b79 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-https.no-redirect.https.html
index a009215e601..a7399e2dcd2 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.keep-scheme.https.html
index 0271fd3694c..1c26e0c6e49 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.no-redirect.https.html
index 2a1158bbb99..3ba399bb528 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.swap-scheme.https.html
index d9f4916bee7..b5950d9318f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.keep-scheme.https.html
index 5258084ec5e..b9a80c07de4 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.no-redirect.https.html
index 437db2c854b..1b2f858a7ab 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.swap-scheme.https.html
index 48fb79a3021..6c8e517bf53 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-https.keep-scheme.https.html
index 49a5222cf78..403fc3417d7 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-https.no-redirect.https.html
index b111698b904..89f4bd68af8 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.keep-scheme.https.html
index 5973cc7ef1f..a2eff5fdbb0 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.no-redirect.https.html
index 6f8ec890f13..d778e5c873c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.swap-scheme.https.html
index 21e8ec651d0..23b98c374e4 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.keep-scheme.https.html
index 9f57d2e8d76..c35a70d5bd9 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.no-redirect.https.html
index 0e4e5dab66a..b4623495821 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.swap-scheme.https.html
index 97a512f434d..fcb0b175c35 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-https.keep-scheme.https.html
index 91ef446211f..1afc5a26977 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-https.no-redirect.https.html
index a5f042be150..ed7892242a9 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.keep-scheme.https.html
index 6e8da756204..fedb12fcc32 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.no-redirect.https.html
index 32fa16408b1..657ed84d2bb 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.swap-scheme.https.html
index 9fab4e28179..1ccb5f30cc5 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.keep-scheme.https.html
index 81a971be921..caa5f4b57e4 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.no-redirect.https.html
index 5d434c05047..7bf0db17cd5 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.swap-scheme.https.html
index 431caad8a02..4a91a21f0dd 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-https.keep-scheme.https.html
index e569aca97f8..d7d0f8c6b88 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-https.no-redirect.https.html
index 00a1085db03..78472a91242 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.keep-scheme.https.html
index 1f4d8e61eee..2cbded7e614 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.no-redirect.https.html
index 4027b3ec858..4e75da94e53 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.swap-scheme.https.html
index 90d4553b6b8..98faf005e95 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.keep-scheme.https.html
index 81bffa4220f..4da5197252c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.no-redirect.https.html
index 31e123c95f9..709562268b2 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.swap-scheme.https.html
index ae01e10930f..991ddf81804 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-https.keep-scheme.https.html
index 131bfeb1737..f199071a959 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-https.no-redirect.https.html
index 96e0e303b99..76b119d5181 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.keep-scheme.https.html
index d6de7f78362..4f5d2f6030a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.no-redirect.https.html
index 5109c5b45f1..09aa7897688 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.swap-scheme.https.html
index 9e0eac105f4..345d3d60018 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.keep-scheme.https.html
index 8c1d39e2e53..529c85c68fd 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.no-redirect.https.html
index da24a8a50b4..ff88cbd4453 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.swap-scheme.https.html
index 7ec5888d3cd..5fd88554bee 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-https.keep-scheme.https.html
index 0609fa835c2..f834427d906 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-https.no-redirect.https.html
index a55cbc20b3f..06138a35960 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.keep-scheme.https.html
index e96a0649bdb..4bec395b89b 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.no-redirect.https.html
index 9367a0e6ef6..5a98e969315 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.swap-scheme.https.html
index 5dc4ebcd7f8..e4ebe6eec9e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.keep-scheme.https.html
index d2840c52080..bee78809a5c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.no-redirect.https.html
index b3b9c49faf3..18102d6d2fa 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.swap-scheme.https.html
index ef03e297e96..5b9ae888b25 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-https.keep-scheme.https.html
index fc92036fbae..a2211cf181f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-https.no-redirect.https.html
index 45dfa55e212..c16b9831bcb 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.keep-scheme.https.html
index e881494b92b..a483e48787d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.no-redirect.https.html
index afca8013aad..de0e2d31f32 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.swap-scheme.https.html
index 582221b6ebf..bcc80e96055 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.keep-scheme.https.html
index fb9a3a471be..8767eb58485 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.no-redirect.https.html
index 1c5ac976e99..a4dffc09951 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.swap-scheme.https.html
index ff4a8e85b2b..5242d8ec951 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-https.keep-scheme.https.html
index cc89ca59731..b1814df609c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-https.no-redirect.https.html
index f61e2d7983a..14fa0ffa3ec 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.keep-scheme.https.html
index 8ba634d1be6..b8a19ccdb26 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.no-redirect.https.html
index 216be7f8650..01dac7c6e1d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.swap-scheme.https.html
index 1340df63bfb..92eea339a7c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.keep-scheme.https.html
index a4ff29a8ba3..88bf23e9270 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.no-redirect.https.html
index 884c5634821..037008e4c66 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.swap-scheme.https.html
index bd6fcbbb06c..c758770f96b 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-https.keep-scheme.https.html
index a6b18616e2b..337c8745aa6 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-https.no-redirect.https.html
index 6ddc092c5d6..053785eed75 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.keep-scheme.https.html
index 9ff477cc49d..6d53b026301 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.no-redirect.https.html
index fbfb8fbe7f9..963c4196c28 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.swap-scheme.https.html
index fa55bdbe2ba..17eec145049 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-http.keep-scheme.https.html
index 8522fa36fb3..792a2901f48 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-http.no-redirect.https.html
index 1668b85c48b..2feee7befe8 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-http.swap-scheme.https.html
index 98ed3608031..a976fc107d4 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-https.keep-scheme.https.html
index e05e09b077f..cab77fe02d1 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-https.no-redirect.https.html
index 0c58b6aadec..b9bc0f4f535 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/audio-tag/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/audio-tag/cross-http.no-redirect.https.html
index 41a6ca4fa89..d0c3456fefc 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/audio-tag/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/audio-tag/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/audio-tag/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/audio-tag/same-http.no-redirect.https.html
index d1c7fe9a48f..eea7de15bd7 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/audio-tag/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/audio-tag/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/audio-tag/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/audio-tag/same-https.no-redirect.https.html
index 0e29720d16e..76a30178db4 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/audio-tag/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/audio-tag/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/beacon/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/beacon/cross-http.no-redirect.https.html
index 75f0e66ed24..a9fe9a58558 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/beacon/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/beacon/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/beacon/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/beacon/same-http.no-redirect.https.html
index c0a950443f5..2ab2f874e0d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/beacon/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/beacon/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/beacon/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/beacon/same-https.no-redirect.https.html
index 4443ddbf63a..7596600ff1b 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/beacon/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/beacon/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/fetch/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/fetch/cross-http.no-redirect.https.html
index 7d903934db4..4d3494449c4 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/fetch/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/fetch/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/fetch/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/fetch/same-http.no-redirect.https.html
index 2842dc4a5da..def5709f833 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/fetch/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/fetch/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/fetch/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/fetch/same-https.no-redirect.https.html
index 7c9a29f34c1..154c05f6116 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/fetch/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/fetch/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/img-tag/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/img-tag/cross-http.no-redirect.https.html
index 646f07032ef..942a32b96b0 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/img-tag/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/img-tag/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/img-tag/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/img-tag/same-http.no-redirect.https.html
index 1d3ad732ca8..eaadb43e212 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/img-tag/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/img-tag/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/img-tag/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/img-tag/same-https.no-redirect.https.html
index 33f3c0ce6c9..8db9f5ffdbb 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/img-tag/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/img-tag/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/link-css-tag/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/link-css-tag/cross-http.no-redirect.https.html
index fd88ca31c2b..f687166671a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/link-css-tag/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/link-css-tag/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/link-css-tag/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/link-css-tag/same-http.no-redirect.https.html
index 26cd1cd8599..6dada36eac4 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/link-css-tag/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/link-css-tag/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/link-css-tag/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/link-css-tag/same-https.no-redirect.https.html
index ac7d84ce57a..ca9e6bd98be 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/link-css-tag/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/link-css-tag/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/link-prefetch-tag/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/link-prefetch-tag/cross-http.no-redirect.https.html
index 9b666e04466..a613a1cc917 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/link-prefetch-tag/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/link-prefetch-tag/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/link-prefetch-tag/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/link-prefetch-tag/same-http.no-redirect.https.html
index 8b091cf805d..8af35047e08 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/link-prefetch-tag/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/link-prefetch-tag/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/link-prefetch-tag/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/link-prefetch-tag/same-https.no-redirect.https.html
index 0ab72967f38..c832f319813 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/link-prefetch-tag/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/link-prefetch-tag/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/object-tag/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/object-tag/cross-http.no-redirect.https.html
index 911a6c14b85..1026da6765f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/object-tag/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/object-tag/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/object-tag/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/object-tag/same-http.no-redirect.https.html
index 2d98598312b..881141b0357 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/object-tag/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/object-tag/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/object-tag/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/object-tag/same-https.no-redirect.https.html
index 1981266f34c..b593447c70f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/object-tag/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/object-tag/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/picture-tag/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/picture-tag/cross-http.no-redirect.https.html
index e5d5382d610..4bcc50cf623 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/picture-tag/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/picture-tag/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/picture-tag/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/picture-tag/same-http.no-redirect.https.html
index 8da3f84ab7d..31bc96e147f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/picture-tag/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/picture-tag/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/picture-tag/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/picture-tag/same-https.no-redirect.https.html
index a8934783f5e..3dbc401b720 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/picture-tag/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/picture-tag/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/script-tag/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/script-tag/cross-http.no-redirect.https.html
index 7c77c277c11..9324c61295b 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/script-tag/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/script-tag/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/script-tag/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/script-tag/same-http.no-redirect.https.html
index 57ff57251ea..51834ee80f7 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/script-tag/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/script-tag/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/script-tag/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/script-tag/same-https.no-redirect.https.html
index 143831d1ab6..c96bec02a15 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/script-tag/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/script-tag/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/video-tag/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/video-tag/cross-http.no-redirect.https.html
index 356a34843f4..12e43d3e7e3 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/video-tag/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/video-tag/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/video-tag/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/video-tag/same-http.no-redirect.https.html
index 6bc12d11978..1d525b42966 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/video-tag/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/video-tag/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/video-tag/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/video-tag/same-https.no-redirect.https.html
index 5e3bb47e4d5..60219c64304 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/video-tag/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/video-tag/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/websocket/cross-ws.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/websocket/cross-ws.no-redirect.https.html
index afabb884f87..4e192afe824 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/websocket/cross-ws.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/websocket/cross-ws.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/websocket/same-ws.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/websocket/same-ws.no-redirect.https.html
index b069f26285c..5a3ae547305 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/websocket/same-ws.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/websocket/same-ws.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/websocket/same-wss.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/websocket/same-wss.no-redirect.https.html
index 0eb3615fadb..4764cab154b 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/websocket/same-wss.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/websocket/same-wss.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-classic/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-classic/cross-http.no-redirect.https.html
index aec04843dc3..36ee4ed56d0 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-classic/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-classic/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-classic/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-classic/same-http.no-redirect.https.html
index 8f225224e1e..bdc906277b1 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-classic/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-classic/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-classic/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-classic/same-https.no-redirect.https.html
index 6312ec33cd8..d29ea4ddf0f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-classic/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-classic/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-import-data/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-import-data/cross-http.no-redirect.https.html
index 4691301d41d..a6a75473132 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-import-data/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-import-data/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-import-data/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-import-data/same-http.no-redirect.https.html
index 1df8ad9efb0..e5662eca782 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-import-data/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-import-data/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-import-data/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-import-data/same-https.no-redirect.https.html
index 670ffdd28e9..ce40498e7af 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-import-data/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-import-data/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-module/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-module/cross-http.no-redirect.https.html
index 95690945ebd..87dd4d87ee0 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-module/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-module/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-module/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-module/same-http.no-redirect.https.html
index 66fb5c30326..e837b2cbbd2 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-module/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-module/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-module/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-module/same-https.no-redirect.https.html
index aa75c6e95af..ed25f086f56 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-module/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-module/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-animation-import-data/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-animation-import-data/cross-http.no-redirect.https.html
index d114a5744b6..e3c25daa7cd 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-animation-import-data/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-animation-import-data/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-animation-import-data/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-animation-import-data/same-http.no-redirect.https.html
index 74fd65195cb..6059273d49c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-animation-import-data/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-animation-import-data/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-animation-import-data/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-animation-import-data/same-https.no-redirect.https.html
index d7b407df508..d5e1333f680 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-animation-import-data/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-animation-import-data/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-animation/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-animation/cross-http.no-redirect.https.html
index 491e1178c2b..b470340f871 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-animation/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-animation/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-animation/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-animation/same-http.no-redirect.https.html
index 80eb66fa252..be79725a1d7 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-animation/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-animation/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-animation/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-animation/same-https.no-redirect.https.html
index b6e56d9c0f5..a70282ab432 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-animation/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-animation/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-audio-import-data/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-audio-import-data/cross-http.no-redirect.https.html
index d0d6d48098e..a50ed273c54 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-audio-import-data/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-audio-import-data/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-audio-import-data/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-audio-import-data/same-http.no-redirect.https.html
index 45788a9ef5f..f284152c72e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-audio-import-data/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-audio-import-data/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-audio-import-data/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-audio-import-data/same-https.no-redirect.https.html
index 2e1866acc7a..517c97f1b0b 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-audio-import-data/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-audio-import-data/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-audio/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-audio/cross-http.no-redirect.https.html
index bd0f0e6c126..866046e59ef 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-audio/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-audio/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-audio/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-audio/same-http.no-redirect.https.html
index 61904821c9a..7eeddcfdb09 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-audio/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-audio/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-audio/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-audio/same-https.no-redirect.https.html
index 343df639234..a3804ee8f9e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-audio/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-audio/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-layout-import-data/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-layout-import-data/cross-http.no-redirect.https.html
index 76cac0228da..284fd13f0e8 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-layout-import-data/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-layout-import-data/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-layout-import-data/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-layout-import-data/same-http.no-redirect.https.html
index 880fb302332..d478c131764 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-layout-import-data/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-layout-import-data/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-layout-import-data/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-layout-import-data/same-https.no-redirect.https.html
index a833d44f731..dbba6efaa21 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-layout-import-data/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-layout-import-data/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-layout/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-layout/cross-http.no-redirect.https.html
index e12e978f198..f0f027571bc 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-layout/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-layout/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-layout/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-layout/same-http.no-redirect.https.html
index 448583db71e..fdf08bb8406 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-layout/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-layout/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-layout/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-layout/same-https.no-redirect.https.html
index e395b04a8d7..fd1cfc09ae3 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-layout/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-layout/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-paint-import-data/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-paint-import-data/cross-http.no-redirect.https.html
index bd6943b0962..17ae0d1bfbd 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-paint-import-data/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-paint-import-data/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-paint-import-data/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-paint-import-data/same-http.no-redirect.https.html
index f0bafddb4af..b5ec91933ef 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-paint-import-data/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-paint-import-data/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-paint-import-data/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-paint-import-data/same-https.no-redirect.https.html
index 16a6b331df2..5ba63761c67 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-paint-import-data/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-paint-import-data/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-paint/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-paint/cross-http.no-redirect.https.html
index 23dbcd9eb68..6bcffc7ead6 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-paint/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-paint/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-paint/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-paint/same-http.no-redirect.https.html
index 6d5642fa652..2116616b155 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-paint/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-paint/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-paint/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-paint/same-https.no-redirect.https.html
index 2a67ca33750..d07de21b79d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-paint/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-paint/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/xhr/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/xhr/cross-http.no-redirect.https.html
index bbf7fc8b79e..4d8bfc52633 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/xhr/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/xhr/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/xhr/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/xhr/same-http.no-redirect.https.html
index 2e2ecab17b2..0224948fad4 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/xhr/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/xhr/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/xhr/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/xhr/same-https.no-redirect.https.html
index 9d700e35260..b0b4c3a5bc6 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/xhr/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/xhr/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/audio-tag/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/audio-tag/cross-http.keep-scheme.https.html
index 876211d9255..f955c31235f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/audio-tag/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/audio-tag/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/audio-tag/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/audio-tag/cross-http.no-redirect.https.html
index b999bfffa34..d06517a0b7a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/audio-tag/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/audio-tag/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/audio-tag/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/audio-tag/cross-http.swap-scheme.https.html
index bcb03d808ed..56f69bf16e2 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/audio-tag/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/audio-tag/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/audio-tag/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/audio-tag/same-http.keep-scheme.https.html
index 42fdd2b3eba..128a457d134 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/audio-tag/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/audio-tag/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/audio-tag/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/audio-tag/same-http.no-redirect.https.html
index 47a71830555..0d7bbbd3899 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/audio-tag/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/audio-tag/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/audio-tag/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/audio-tag/same-http.swap-scheme.https.html
index ac2a2032530..11c60ffbb56 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/audio-tag/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/audio-tag/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/audio-tag/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/audio-tag/same-https.keep-scheme.https.html
index 7da3e5a2dde..c82f589246f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/audio-tag/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/audio-tag/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/audio-tag/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/audio-tag/same-https.no-redirect.https.html
index b1938717640..d475bbe0cf5 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/audio-tag/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/audio-tag/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/beacon/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/beacon/cross-http.keep-scheme.https.html
index 2604c38b67f..0f4d641ff8f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/beacon/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/beacon/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/beacon/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/beacon/cross-http.no-redirect.https.html
index 8a297d62c48..5be5db15548 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/beacon/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/beacon/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/beacon/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/beacon/cross-http.swap-scheme.https.html
index a9bb4fe2853..3eefb62b4d1 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/beacon/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/beacon/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/beacon/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/beacon/same-http.keep-scheme.https.html
index 75d150dba77..984b353c92a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/beacon/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/beacon/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/beacon/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/beacon/same-http.no-redirect.https.html
index 8203cb7e1df..46234a71683 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/beacon/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/beacon/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/beacon/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/beacon/same-http.swap-scheme.https.html
index 54114ff754b..27b956ee0b2 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/beacon/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/beacon/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/beacon/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/beacon/same-https.keep-scheme.https.html
index 9a7cc113b33..52f3cb99ada 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/beacon/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/beacon/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/beacon/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/beacon/same-https.no-redirect.https.html
index 86c56bdfef5..303e047ba53 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/beacon/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/beacon/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/fetch/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/fetch/cross-http.keep-scheme.https.html
index d98fee3b05f..ea9697785b3 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/fetch/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/fetch/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/fetch/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/fetch/cross-http.no-redirect.https.html
index 6f111d12623..8a296455861 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/fetch/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/fetch/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/fetch/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/fetch/cross-http.swap-scheme.https.html
index 0b35f8b6d90..c080c346ccb 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/fetch/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/fetch/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/fetch/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/fetch/same-http.keep-scheme.https.html
index b96a2125eb6..ea9c18d6a81 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/fetch/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/fetch/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/fetch/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/fetch/same-http.no-redirect.https.html
index 280a9cdc6b8..dfbd794400c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/fetch/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/fetch/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/fetch/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/fetch/same-http.swap-scheme.https.html
index a9063e42946..2e6296c483c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/fetch/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/fetch/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/fetch/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/fetch/same-https.keep-scheme.https.html
index 4e2f750fd1d..34f1b72647c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/fetch/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/fetch/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/fetch/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/fetch/same-https.no-redirect.https.html
index 74817ec7dae..71a29f3f2d4 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/fetch/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/fetch/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/img-tag/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/img-tag/cross-http.keep-scheme.https.html
index 5ec2714a6c4..30f7407b971 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/img-tag/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/img-tag/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/img-tag/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/img-tag/cross-http.no-redirect.https.html
index 27de3169b90..846846cbae8 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/img-tag/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/img-tag/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/img-tag/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/img-tag/cross-http.swap-scheme.https.html
index efdfd63e546..1da530e726d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/img-tag/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/img-tag/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/img-tag/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/img-tag/same-http.keep-scheme.https.html
index 774ca7f99a3..be6065356c7 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/img-tag/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/img-tag/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/img-tag/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/img-tag/same-http.no-redirect.https.html
index 3590a140a1d..7c2e96c973b 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/img-tag/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/img-tag/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/img-tag/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/img-tag/same-http.swap-scheme.https.html
index 09e8d424ffe..ccbcf08d624 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/img-tag/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/img-tag/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/img-tag/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/img-tag/same-https.keep-scheme.https.html
index d8687bd8b6e..83297b91af3 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/img-tag/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/img-tag/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/img-tag/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/img-tag/same-https.no-redirect.https.html
index ffa2e47c8a1..951b0aa295e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/img-tag/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/img-tag/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-css-tag/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-css-tag/cross-http.keep-scheme.https.html
index 7ee41857344..4ca29b6c059 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-css-tag/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-css-tag/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-css-tag/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-css-tag/cross-http.no-redirect.https.html
index be00ef5d27d..edcf944a748 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-css-tag/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-css-tag/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-css-tag/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-css-tag/cross-http.swap-scheme.https.html
index 9bed22b198f..c408c72d125 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-css-tag/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-css-tag/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-css-tag/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-css-tag/same-http.keep-scheme.https.html
index 3849927c9b3..6eabfab8234 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-css-tag/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-css-tag/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-css-tag/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-css-tag/same-http.no-redirect.https.html
index cdde11b1449..4f823de23e6 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-css-tag/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-css-tag/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-css-tag/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-css-tag/same-http.swap-scheme.https.html
index e9bcc9e6bf7..96a08a133b3 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-css-tag/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-css-tag/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-css-tag/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-css-tag/same-https.keep-scheme.https.html
index 493d92e34f9..8f3414e493f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-css-tag/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-css-tag/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-css-tag/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-css-tag/same-https.no-redirect.https.html
index 69ab08e8f30..b9b3a61d3cd 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-css-tag/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-css-tag/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/cross-http.keep-scheme.https.html
index 30594cc7547..cd95c8c3aef 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/cross-http.no-redirect.https.html
index 533309e93b3..a21b718800e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/cross-http.swap-scheme.https.html
index 5f8ce108fc6..99483c30b02 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/same-http.keep-scheme.https.html
index 076ecb8328d..6020508010c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/same-http.no-redirect.https.html
index 534d3a13428..8b671426473 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/same-http.swap-scheme.https.html
index cd87071760b..29a0d46a8a5 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/same-https.keep-scheme.https.html
index 1f1b6d12361..0ba438eee6e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/same-https.no-redirect.https.html
index f8cf49fd07e..555c53485ec 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/object-tag/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/object-tag/cross-http.keep-scheme.https.html
index de3c2cafe69..828db98e0db 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/object-tag/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/object-tag/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/object-tag/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/object-tag/cross-http.no-redirect.https.html
index ee9625d31eb..1dace197dd2 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/object-tag/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/object-tag/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/object-tag/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/object-tag/cross-http.swap-scheme.https.html
index ab0a387f7c5..30b3c5bb3cf 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/object-tag/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/object-tag/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/object-tag/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/object-tag/same-http.keep-scheme.https.html
index edbb3f9f2db..ec9eb5b8f2c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/object-tag/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/object-tag/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/object-tag/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/object-tag/same-http.no-redirect.https.html
index 72ae7e512a6..4fb39defdf9 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/object-tag/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/object-tag/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/object-tag/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/object-tag/same-http.swap-scheme.https.html
index fb969da6369..01676bab338 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/object-tag/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/object-tag/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/object-tag/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/object-tag/same-https.keep-scheme.https.html
index c537a645e00..ac1e8531154 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/object-tag/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/object-tag/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/object-tag/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/object-tag/same-https.no-redirect.https.html
index ea3e82ac9f4..e248122edeb 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/object-tag/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/object-tag/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/picture-tag/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/picture-tag/cross-http.keep-scheme.https.html
index 6ad20e5a28b..6417081f9fe 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/picture-tag/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/picture-tag/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/picture-tag/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/picture-tag/cross-http.no-redirect.https.html
index 533eb0ba8fb..2c3f9e1cbfa 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/picture-tag/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/picture-tag/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/picture-tag/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/picture-tag/cross-http.swap-scheme.https.html
index 6c531f3cbcf..886e6ef82fd 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/picture-tag/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/picture-tag/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/picture-tag/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/picture-tag/same-http.keep-scheme.https.html
index d46d6f40430..75289034c92 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/picture-tag/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/picture-tag/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/picture-tag/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/picture-tag/same-http.no-redirect.https.html
index 981d6c5a2ad..52a421f7428 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/picture-tag/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/picture-tag/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/picture-tag/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/picture-tag/same-http.swap-scheme.https.html
index 68233cd9b21..26ed43eca37 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/picture-tag/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/picture-tag/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/picture-tag/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/picture-tag/same-https.keep-scheme.https.html
index e702aef5b02..6d10711d638 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/picture-tag/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/picture-tag/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/picture-tag/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/picture-tag/same-https.no-redirect.https.html
index b26d44db206..fe4da56e32a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/picture-tag/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/picture-tag/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/script-tag/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/script-tag/cross-http.keep-scheme.https.html
index 727fc11dc38..a5f903c2fd2 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/script-tag/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/script-tag/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/script-tag/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/script-tag/cross-http.no-redirect.https.html
index 9b416e87fb1..f3594a9c55c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/script-tag/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/script-tag/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/script-tag/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/script-tag/cross-http.swap-scheme.https.html
index fd6c3be8ae3..1933b3753a2 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/script-tag/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/script-tag/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/script-tag/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/script-tag/same-http.keep-scheme.https.html
index 479be786348..bfc3391e7d4 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/script-tag/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/script-tag/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/script-tag/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/script-tag/same-http.no-redirect.https.html
index c32977196a9..712f802dc16 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/script-tag/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/script-tag/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/script-tag/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/script-tag/same-http.swap-scheme.https.html
index ba13e682fdb..c70728730d8 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/script-tag/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/script-tag/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/script-tag/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/script-tag/same-https.keep-scheme.https.html
index 01b37600dee..d58c20a049b 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/script-tag/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/script-tag/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/script-tag/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/script-tag/same-https.no-redirect.https.html
index 7d240ececc1..3d29665067f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/script-tag/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/script-tag/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/video-tag/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/video-tag/cross-http.keep-scheme.https.html
index 9529cf7e8d3..f40396db938 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/video-tag/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/video-tag/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/video-tag/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/video-tag/cross-http.no-redirect.https.html
index ea35f29833d..98fa4b69498 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/video-tag/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/video-tag/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/video-tag/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/video-tag/cross-http.swap-scheme.https.html
index 4b469e65810..d521ef72c98 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/video-tag/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/video-tag/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/video-tag/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/video-tag/same-http.keep-scheme.https.html
index 8020ee0e8ad..5f4696c44e7 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/video-tag/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/video-tag/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/video-tag/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/video-tag/same-http.no-redirect.https.html
index fbaa49b7a9a..4c3d2b8a0fe 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/video-tag/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/video-tag/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/video-tag/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/video-tag/same-http.swap-scheme.https.html
index f0b76254b46..2aef0959dde 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/video-tag/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/video-tag/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Optionally-blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/video-tag/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/video-tag/same-https.keep-scheme.https.html
index 79b3c0a2848..89f1f67de62 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/video-tag/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/video-tag/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/video-tag/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/video-tag/same-https.no-redirect.https.html
index c2c7f8723c4..2860df22162 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/video-tag/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/video-tag/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/websocket/cross-ws.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/websocket/cross-ws.keep-scheme.https.html
index 18ec117f461..1c5302b12c4 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/websocket/cross-ws.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/websocket/cross-ws.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/websocket/cross-ws.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/websocket/cross-ws.no-redirect.https.html
index 1673464aae0..8437326b180 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/websocket/cross-ws.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/websocket/cross-ws.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/websocket/cross-ws.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/websocket/cross-ws.swap-scheme.https.html
index bd8d6fd7967..92fd464c93a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/websocket/cross-ws.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/websocket/cross-ws.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/websocket/same-ws.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/websocket/same-ws.keep-scheme.https.html
index b5080134174..ac11208f23e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/websocket/same-ws.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/websocket/same-ws.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/websocket/same-ws.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/websocket/same-ws.no-redirect.https.html
index 9f168b080fa..967445ee8d5 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/websocket/same-ws.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/websocket/same-ws.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/websocket/same-ws.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/websocket/same-ws.swap-scheme.https.html
index 24445374ae5..273712aad9b 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/websocket/same-ws.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/websocket/same-ws.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/websocket/same-wss.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/websocket/same-wss.keep-scheme.https.html
index b397c4e2a61..47619170144 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/websocket/same-wss.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/websocket/same-wss.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/websocket/same-wss.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/websocket/same-wss.no-redirect.https.html
index d19674db08c..ed5c0ab8a77 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/websocket/same-wss.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/websocket/same-wss.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/cross-http.keep-scheme.https.html
index 85290c11b71..8a915c29f9f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/cross-http.no-redirect.https.html
index 0e125bcd8be..5aabf759341 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/cross-http.swap-scheme.https.html
index b92b11d0be8..90c204d7a0d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/same-http.keep-scheme.https.html
index 213cf96bb28..93668db49e4 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/same-http.no-redirect.https.html
index 5ec4866157a..8521e37281c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/same-http.swap-scheme.https.html
index c75044d4310..d5f79ad6021 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/same-https.keep-scheme.https.html
index 5c5d73b35e9..042bd14fa81 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/same-https.no-redirect.https.html
index 4aa31ce50e4..05b13b680a5 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-import-data/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-import-data/cross-http.keep-scheme.https.html
index adba8778717..60963f90586 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-import-data/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-import-data/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-import-data/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-import-data/cross-http.no-redirect.https.html
index 7b54a338fdf..7ced3b86cdb 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-import-data/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-import-data/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-import-data/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-import-data/cross-http.swap-scheme.https.html
index 57d144abd75..15711a976bf 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-import-data/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-import-data/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-import-data/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-import-data/same-http.keep-scheme.https.html
index cb127cf1792..4a1d3766839 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-import-data/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-import-data/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-import-data/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-import-data/same-http.no-redirect.https.html
index 768fd4cce7f..b8c53bae221 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-import-data/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-import-data/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-import-data/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-import-data/same-http.swap-scheme.https.html
index 736f6bce379..be403a893c9 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-import-data/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-import-data/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-import-data/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-import-data/same-https.keep-scheme.https.html
index 5be23a03117..06a8f47ae42 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-import-data/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-import-data/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-import-data/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-import-data/same-https.no-redirect.https.html
index 858a1528043..211bd0d2998 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-import-data/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-import-data/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/cross-http.keep-scheme.https.html
index a1e6f61e6b7..69dcfb7e5cb 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/cross-http.no-redirect.https.html
index a95d2061b68..816e3449092 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/cross-http.swap-scheme.https.html
index c396cdc20ba..9e167de1486 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/same-http.keep-scheme.https.html
index 20414a3dac3..75e103e6343 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/same-http.no-redirect.https.html
index 9397a3523e8..f9e963d8dc7 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/same-http.swap-scheme.https.html
index 0340366bdf2..f0397f11b69 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/same-https.keep-scheme.https.html
index da0e808f184..b81758e5b79 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/same-https.no-redirect.https.html
index a009215e601..a7399e2dcd2 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/cross-http.keep-scheme.https.html
index 0271fd3694c..1c26e0c6e49 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/cross-http.no-redirect.https.html
index 2a1158bbb99..3ba399bb528 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/cross-http.swap-scheme.https.html
index d9f4916bee7..b5950d9318f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-http.keep-scheme.https.html
index 5258084ec5e..b9a80c07de4 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-http.no-redirect.https.html
index 437db2c854b..1b2f858a7ab 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-http.swap-scheme.https.html
index 48fb79a3021..6c8e517bf53 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-https.keep-scheme.https.html
index 49a5222cf78..403fc3417d7 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-https.no-redirect.https.html
index b111698b904..89f4bd68af8 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation/cross-http.keep-scheme.https.html
index 5973cc7ef1f..a2eff5fdbb0 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation/cross-http.no-redirect.https.html
index 6f8ec890f13..d778e5c873c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation/cross-http.swap-scheme.https.html
index 21e8ec651d0..23b98c374e4 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation/same-http.keep-scheme.https.html
index 9f57d2e8d76..c35a70d5bd9 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation/same-http.no-redirect.https.html
index 0e4e5dab66a..b4623495821 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation/same-http.swap-scheme.https.html
index 97a512f434d..fcb0b175c35 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation/same-https.keep-scheme.https.html
index 91ef446211f..1afc5a26977 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation/same-https.no-redirect.https.html
index a5f042be150..ed7892242a9 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/cross-http.keep-scheme.https.html
index 6e8da756204..fedb12fcc32 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/cross-http.no-redirect.https.html
index 32fa16408b1..657ed84d2bb 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/cross-http.swap-scheme.https.html
index 9fab4e28179..1ccb5f30cc5 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-http.keep-scheme.https.html
index 81a971be921..caa5f4b57e4 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-http.no-redirect.https.html
index 5d434c05047..7bf0db17cd5 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-http.swap-scheme.https.html
index 431caad8a02..4a91a21f0dd 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-https.keep-scheme.https.html
index e569aca97f8..d7d0f8c6b88 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-https.no-redirect.https.html
index 00a1085db03..78472a91242 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio/cross-http.keep-scheme.https.html
index 1f4d8e61eee..2cbded7e614 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio/cross-http.no-redirect.https.html
index 4027b3ec858..4e75da94e53 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio/cross-http.swap-scheme.https.html
index 90d4553b6b8..98faf005e95 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio/same-http.keep-scheme.https.html
index 81bffa4220f..4da5197252c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio/same-http.no-redirect.https.html
index 31e123c95f9..709562268b2 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio/same-http.swap-scheme.https.html
index ae01e10930f..991ddf81804 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio/same-https.keep-scheme.https.html
index 131bfeb1737..f199071a959 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio/same-https.no-redirect.https.html
index 96e0e303b99..76b119d5181 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/cross-http.keep-scheme.https.html
index d6de7f78362..4f5d2f6030a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/cross-http.no-redirect.https.html
index 5109c5b45f1..09aa7897688 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/cross-http.swap-scheme.https.html
index 9e0eac105f4..345d3d60018 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-http.keep-scheme.https.html
index 8c1d39e2e53..529c85c68fd 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-http.no-redirect.https.html
index da24a8a50b4..ff88cbd4453 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-http.swap-scheme.https.html
index 7ec5888d3cd..5fd88554bee 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-https.keep-scheme.https.html
index 0609fa835c2..f834427d906 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-https.no-redirect.https.html
index a55cbc20b3f..06138a35960 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout/cross-http.keep-scheme.https.html
index e96a0649bdb..4bec395b89b 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout/cross-http.no-redirect.https.html
index 9367a0e6ef6..5a98e969315 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout/cross-http.swap-scheme.https.html
index 5dc4ebcd7f8..e4ebe6eec9e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout/same-http.keep-scheme.https.html
index d2840c52080..bee78809a5c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout/same-http.no-redirect.https.html
index b3b9c49faf3..18102d6d2fa 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout/same-http.swap-scheme.https.html
index ef03e297e96..5b9ae888b25 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout/same-https.keep-scheme.https.html
index fc92036fbae..a2211cf181f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout/same-https.no-redirect.https.html
index 45dfa55e212..c16b9831bcb 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/cross-http.keep-scheme.https.html
index e881494b92b..a483e48787d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/cross-http.no-redirect.https.html
index afca8013aad..de0e2d31f32 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/cross-http.swap-scheme.https.html
index 582221b6ebf..bcc80e96055 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-http.keep-scheme.https.html
index fb9a3a471be..8767eb58485 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-http.no-redirect.https.html
index 1c5ac976e99..a4dffc09951 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-http.swap-scheme.https.html
index ff4a8e85b2b..5242d8ec951 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-https.keep-scheme.https.html
index cc89ca59731..b1814df609c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-https.no-redirect.https.html
index f61e2d7983a..14fa0ffa3ec 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint/cross-http.keep-scheme.https.html
index 8ba634d1be6..b8a19ccdb26 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint/cross-http.no-redirect.https.html
index 216be7f8650..01dac7c6e1d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint/cross-http.swap-scheme.https.html
index 1340df63bfb..92eea339a7c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint/same-http.keep-scheme.https.html
index a4ff29a8ba3..88bf23e9270 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint/same-http.no-redirect.https.html
index 884c5634821..037008e4c66 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint/same-http.swap-scheme.https.html
index bd6fcbbb06c..c758770f96b 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint/same-https.keep-scheme.https.html
index a6b18616e2b..337c8745aa6 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint/same-https.no-redirect.https.html
index 6ddc092c5d6..053785eed75 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/xhr/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/xhr/cross-http.keep-scheme.https.html
index 9ff477cc49d..6d53b026301 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/xhr/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/xhr/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/xhr/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/xhr/cross-http.no-redirect.https.html
index fbfb8fbe7f9..963c4196c28 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/xhr/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/xhr/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/xhr/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/xhr/cross-http.swap-scheme.https.html
index fa55bdbe2ba..17eec145049 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/xhr/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/xhr/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/xhr/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/xhr/same-http.keep-scheme.https.html
index 8522fa36fb3..792a2901f48 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/xhr/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/xhr/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/xhr/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/xhr/same-http.no-redirect.https.html
index 1668b85c48b..2feee7befe8 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/xhr/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/xhr/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/xhr/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/xhr/same-http.swap-scheme.https.html
index 98ed3608031..a976fc107d4 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/xhr/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/xhr/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/xhr/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/xhr/same-https.keep-scheme.https.html
index e05e09b077f..cab77fe02d1 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/xhr/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/xhr/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/xhr/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/xhr/same-https.no-redirect.https.html
index 0c58b6aadec..b9bc0f4f535 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/xhr/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/xhr/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html
index 9559ff59f25..db3319196c8 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.no-redirect.https.html
index 54aa6ef4138..259e3e3f055 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html
index cb6fca62b34..3b951b3ce92 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.keep-scheme.https.html
index f10f67ce9d0..6131d33a7a4 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.no-redirect.https.html
index 331e7df75c5..35e79ebb833 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.swap-scheme.https.html
index 3d2410cc39e..0ee4ae798d3 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-https.keep-scheme.https.html
index 2f6e11dd59a..100a3066d41 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-https.no-redirect.https.html
index 3e86f97729b..116fa4e0391 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/opt-in/fetch/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/opt-in/fetch/cross-http.no-redirect.https.html
index a1d639e5070..f2c47e27ae0 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/opt-in/fetch/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/opt-in/fetch/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/opt-in/fetch/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/opt-in/fetch/same-http.no-redirect.https.html
index 33e44590b32..4584eebca89 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/opt-in/fetch/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/opt-in/fetch/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/opt-in/fetch/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/opt-in/fetch/same-https.no-redirect.https.html
index 9e9efae7fc6..0a0de6ec532 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/opt-in/fetch/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/opt-in/fetch/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/cross-http.keep-scheme.https.html
index 9559ff59f25..db3319196c8 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/cross-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/cross-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/cross-http.no-redirect.https.html
index 54aa6ef4138..259e3e3f055 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/cross-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/cross-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/cross-http.swap-scheme.https.html
index cb6fca62b34..3b951b3ce92 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/cross-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/cross-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-http.keep-scheme.https.html
index f10f67ce9d0..6131d33a7a4 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-http.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-http.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-http.no-redirect.https.html
index 331e7df75c5..35e79ebb833 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-http.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-http.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-http.swap-scheme.https.html
index 3d2410cc39e..0ee4ae798d3 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-http.swap-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-http.swap-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Blockable content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-https.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-https.keep-scheme.https.html
index 2f6e11dd59a..100a3066d41 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-https.keep-scheme.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-https.keep-scheme.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-https.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-https.no-redirect.https.html
index 3e86f97729b..116fa4e0391 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-https.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-https.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
 <html>
   <head>
     <title>Mixed-Content: Allowed content</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/mixed-content/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/mixed-content/generic/spec_json.js b/tests/wpt/web-platform-tests/mixed-content/generic/spec_json.js
index 2f5212e9ff7..e49bbd91c9a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/generic/spec_json.js
+++ b/tests/wpt/web-platform-tests/mixed-content/generic/spec_json.js
@@ -1 +1 @@
-var SPEC_JSON = {"subresource_schema": {"supported_delivery_type": {"picture-tag": [], "worklet-layout": [], "worklet-paint": [], "img-tag": [], "a-tag": [], "worklet-layout-import-data": [], "worklet-audio-import-data": [], "worklet-animation": [], "websocket": [], "worklet-paint-import-data": [], "video-tag": [], "object-tag": [], "worklet-audio": [], "beacon": [], "worker-module": [], "worker-import-data": [], "script-tag": [], "worklet-animation-import-data": [], "link-css-tag": [], "xhr": [], "worker-classic": [], "link-prefetch-tag": [], "audio-tag": [], "fetch": []}}, "source_context_list_schema": {"worker-classic-data": {"subresourcePolicyDeliveries": [], "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "worker-classic-data", "policyDeliveries": []}]}, "top": {"subresourcePolicyDeliveries": [], "description": "Policy set by the top-level Document", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}]}, "worker-module-data": {"subresourcePolicyDeliveries": [], "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "worker-module-data", "policyDeliveries": []}]}}, "test_page_title_template": "Mixed-Content: %(title)s", "test_expansion_schema": {"delivery_value": [null, "opt-in"], "origin": ["same-https", "same-http", "cross-https", "cross-http", "same-wss", "same-ws", "cross-wss", "cross-ws"], "delivery_type": ["http-rp", "meta"], "subresource": {"blockable": ["script-tag", "link-css-tag", "xhr", "worker-classic", "worker-module", "worker-import-data", "worklet-animation", "worklet-audio", "worklet-layout", "worklet-paint", "worklet-animation-import-data", "worklet-audio-import-data", "worklet-layout-import-data", "worklet-paint-import-data", "fetch", "a-tag", "object-tag", "picture-tag", "websocket", "link-prefetch-tag", "beacon"], "optionally-blockable": ["img-tag", "audio-tag", "video-tag"]}, "expectation": ["allowed", "blocked"], "expansion": ["default", "override"], "redirection": ["no-redirect", "keep-scheme", "swap-scheme"], "source_context_list": ["top", "worker-classic-data", "worker-module-data"], "source_scheme": ["http", "https"]}, "selection_pattern": "%(source_context_list)s.%(delivery_type)s/%(delivery_value)s/%(subresource)s/%(origin)s.%(redirection)s.%(source_scheme)s", "specification": [{"test_expansion": [{"delivery_value": "opt-in", "origin": ["cross-http", "same-http"], "delivery_type": "*", "name": "opt-in-blocks", "expectation": "blocked", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "https", "subresource": {"blockable": [], "optionally-blockable": "*"}}, {"delivery_value": null, "origin": ["cross-http", "same-http"], "delivery_type": "*", "name": "no-opt-in-allows", "expectation": "allowed", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "https", "subresource": {"blockable": [], "optionally-blockable": "*"}}], "description": "Test behavior of optionally-blockable content", "specification_url": "http://www.w3.org/TR/mixed-content/#category-optionally-blockable", "name": "optionally-blockable", "title": "Optionally-blockable content"}, {"test_expansion": [{"delivery_value": "opt-in", "origin": ["cross-http", "same-http"], "delivery_type": "*", "name": "opt-in-blocks", "expectation": "blocked", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "https", "subresource": {"blockable": "*", "optionally-blockable": []}}, {"delivery_value": null, "origin": ["cross-http", "same-http"], "delivery_type": "*", "name": "no-opt-in-blocks", "expectation": "blocked", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "https", "subresource": {"blockable": "*", "optionally-blockable": []}}, {"delivery_value": "*", "origin": ["cross-ws", "same-ws"], "delivery_type": "*", "name": "ws-downgrade-blocks", "expectation": "blocked", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "https", "subresource": {"blockable": "websocket", "optionally-blockable": []}}], "description": "Test behavior of blockable content.", "specification_url": "http://www.w3.org/TR/mixed-content/#category-blockable", "name": "blockable", "title": "Blockable content"}, {"test_expansion": [{"delivery_value": "*", "origin": ["same-https"], "delivery_type": "*", "name": "allowed", "expectation": "allowed", "expansion": "default", "redirection": ["no-redirect", "keep-scheme"], "source_context_list": "*", "source_scheme": "https", "subresource": {"blockable": "*", "optionally-blockable": "*"}}, {"delivery_value": "*", "origin": ["same-wss"], "delivery_type": "*", "name": "websocket-allowed", "expectation": "allowed", "expansion": "default", "redirection": ["no-redirect", "keep-scheme"], "source_context_list": "*", "source_scheme": "https", "subresource": {"blockable": "websocket", "optionally-blockable": []}}], "description": "Test behavior of allowed content.", "specification_url": "http://www.w3.org/TR/mixed-content/", "name": "allowed", "title": "Allowed content"}], "test_file_path_pattern": "gen/%(source_context_list)s.%(delivery_type)s/%(delivery_value)s/%(subresource)s/%(origin)s.%(redirection)s.%(source_scheme)s.html", "excluded_tests": [{"delivery_value": null, "origin": "*", "delivery_type": "http-rp", "name": "Skip-redundant-no-opt-in", "expectation": "*", "expansion": "*", "redirection": "*", "source_context_list": "*", "source_scheme": "*", "subresource": {"blockable": "*", "optionally-blockable": "*"}}, {"delivery_value": "*", "origin": "*", "delivery_type": "*", "name": "Redundant-subresources", "expectation": "*", "expansion": "*", "redirection": "*", "source_context_list": "*", "source_scheme": "*", "subresource": {"blockable": ["a-tag"], "optionally-blockable": []}}, {"delivery_value": "*", "origin": ["same-https", "same-http", "cross-https", "cross-http"], "delivery_type": "*", "name": "Skip-origins-not-applicable-to-websockets", "expectation": "*", "expansion": "*", "redirection": "*", "source_context_list": "*", "source_scheme": "*", "subresource": {"blockable": ["websocket"], "optionally-blockable": []}}, {"delivery_value": "opt-in", "origin": "*", "delivery_type": "meta", "name": "Skip-redundant-for-opt-in-method", "expectation": "*", "expansion": "*", "redirection": ["keep-scheme", "swap-scheme"], "source_context_list": "*", "source_scheme": "*", "subresource": {"blockable": "*", "optionally-blockable": "*"}}], "delivery_key": "mixedContent", "test_description_template": "Mixed-Content: Expects %(expectation)s for %(subresource)s to %(origin)s origin and %(redirection)s redirection from %(source_scheme)s context.", "source_context_schema": {"supported_delivery_type": {"iframe": ["http-rp", "meta"], "worker-module-data": [], "worker-classic-data": [], "top": ["http-rp", "meta"], "worker-classic": ["http-rp"], "iframe-blank": ["meta"], "worker-module": ["http-rp"], "srcdoc": ["meta"]}, "supported_subresource": {"iframe": "*", "worker-module-data": ["xhr", "fetch", "websocket"], "worker-classic-data": ["xhr", "fetch", "websocket"], "top": "*", "worker-classic": ["xhr", "fetch", "websocket"], "iframe-blank": "*", "worker-module": ["xhr", "fetch", "websocket"], "srcdoc": "*"}}};
+var SPEC_JSON = {"selection_pattern": "%(source_context_list)s.%(delivery_type)s/%(delivery_value)s/%(subresource)s/%(origin)s.%(redirection)s.%(source_scheme)s", "test_file_path_pattern": "gen/%(source_context_list)s.%(delivery_type)s/%(delivery_value)s/%(subresource)s/%(origin)s.%(redirection)s.%(source_scheme)s.html", "test_description_template": "Mixed-Content: Expects %(expectation)s for %(subresource)s to %(origin)s origin and %(redirection)s redirection from %(source_scheme)s context.", "test_page_title_template": "Mixed-Content: %(title)s", "specification": [{"name": "optionally-blockable", "title": "Optionally-blockable content", "description": "Test behavior of optionally-blockable content", "specification_url": "http://www.w3.org/TR/mixed-content/#category-optionally-blockable", "test_expansion": [{"name": "opt-in-blocks", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": "opt-in", "redirection": "*", "subresource": {"blockable": [], "optionally-blockable": "*"}, "origin": ["cross-http", "same-http"], "expectation": "blocked"}, {"name": "no-opt-in-allows", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": null, "redirection": "*", "subresource": {"blockable": [], "optionally-blockable": "*"}, "origin": ["cross-http", "same-http"], "expectation": "allowed"}]}, {"name": "blockable", "title": "Blockable content", "description": "Test behavior of blockable content.", "specification_url": "http://www.w3.org/TR/mixed-content/#category-blockable", "test_expansion": [{"name": "opt-in-blocks", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": "opt-in", "redirection": "*", "subresource": {"blockable": "*", "optionally-blockable": []}, "origin": ["cross-http", "same-http"], "expectation": "blocked"}, {"name": "no-opt-in-blocks", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": null, "redirection": "*", "subresource": {"blockable": "*", "optionally-blockable": []}, "origin": ["cross-http", "same-http"], "expectation": "blocked"}, {"name": "ws-downgrade-blocks", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": "*", "subresource": {"blockable": "websocket", "optionally-blockable": []}, "origin": ["cross-ws", "same-ws"], "expectation": "blocked"}]}, {"name": "allowed", "title": "Allowed content", "description": "Test behavior of allowed content.", "specification_url": "http://www.w3.org/TR/mixed-content/", "test_expansion": [{"name": "allowed", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": ["no-redirect", "keep-scheme"], "subresource": {"blockable": "*", "optionally-blockable": "*"}, "origin": ["same-https"], "expectation": "allowed"}, {"name": "websocket-allowed", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": ["no-redirect", "keep-scheme"], "subresource": {"blockable": "websocket", "optionally-blockable": []}, "origin": ["same-wss"], "expectation": "allowed"}]}], "delivery_key": "mixedContent", "excluded_tests": [{"name": "Skip-redundant-no-opt-in", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "http-rp", "delivery_value": null, "redirection": "*", "subresource": {"blockable": "*", "optionally-blockable": "*"}, "origin": "*", "expectation": "*"}, {"name": "Redundant-subresources", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": "*", "subresource": {"blockable": ["a-tag"], "optionally-blockable": []}, "origin": "*", "expectation": "*"}, {"name": "Skip-origins-not-applicable-to-websockets", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": "*", "subresource": {"blockable": ["websocket"], "optionally-blockable": []}, "origin": ["same-https", "same-http", "cross-https", "cross-http"], "expectation": "*"}, {"name": "Skip-redundant-for-opt-in-method", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "meta", "delivery_value": "opt-in", "redirection": ["keep-scheme", "swap-scheme"], "subresource": {"blockable": "*", "optionally-blockable": "*"}, "origin": "*", "expectation": "*"}], "source_context_schema": {"supported_delivery_type": {"top": ["http-rp", "meta"], "iframe": ["http-rp", "meta"], "iframe-blank": ["meta"], "srcdoc": ["meta"], "worker-classic": ["http-rp"], "worker-module": ["http-rp"], "worker-classic-data": [], "worker-module-data": []}, "supported_subresource": {"top": "*", "iframe": "*", "iframe-blank": "*", "srcdoc": "*", "worker-classic": ["xhr", "fetch", "websocket"], "worker-module": ["xhr", "fetch", "websocket"], "worker-classic-data": ["xhr", "fetch", "websocket"], "worker-module-data": ["xhr", "fetch", "websocket"]}}, "subresource_schema": {"supported_delivery_type": {"script-tag": [], "link-css-tag": [], "xhr": [], "worker-classic": [], "worker-module": [], "worker-import-data": [], "worklet-animation": [], "worklet-audio": [], "worklet-layout": [], "worklet-paint": [], "worklet-animation-import-data": [], "worklet-audio-import-data": [], "worklet-layout-import-data": [], "worklet-paint-import-data": [], "fetch": [], "a-tag": [], "object-tag": [], "picture-tag": [], "websocket": [], "link-prefetch-tag": [], "beacon": [], "img-tag": [], "audio-tag": [], "video-tag": []}}, "source_context_list_schema": {"top": {"description": "Policy set by the top-level Document", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}], "subresourcePolicyDeliveries": []}, "worker-classic-data": {"sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "worker-classic-data", "policyDeliveries": []}], "subresourcePolicyDeliveries": []}, "worker-module-data": {"sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "worker-module-data", "policyDeliveries": []}], "subresourcePolicyDeliveries": []}}, "test_expansion_schema": {"expansion": ["default", "override"], "source_scheme": ["http", "https"], "delivery_type": ["http-rp", "meta"], "delivery_value": [null, "opt-in"], "source_context_list": ["top", "worker-classic-data", "worker-module-data"], "redirection": ["no-redirect", "keep-scheme", "swap-scheme"], "origin": ["same-https", "same-http", "cross-https", "cross-http", "same-wss", "same-ws", "cross-wss", "cross-ws"], "subresource": {"blockable": ["script-tag", "link-css-tag", "xhr", "worker-classic", "worker-module", "worker-import-data", "worklet-animation", "worklet-audio", "worklet-layout", "worklet-paint", "worklet-animation-import-data", "worklet-audio-import-data", "worklet-layout-import-data", "worklet-paint-import-data", "fetch", "a-tag", "object-tag", "picture-tag", "websocket", "link-prefetch-tag", "beacon"], "optionally-blockable": ["img-tag", "audio-tag", "video-tag"]}, "expectation": ["allowed", "blocked"]}};
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-BroadcastChannel-manual.https.tentative.html b/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-BroadcastChannel-manual.https.tentative.html
new file mode 100644
index 00000000000..322b169985b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-BroadcastChannel-manual.https.tentative.html
@@ -0,0 +1,13 @@
+<!doctype html>
+<meta charset=utf-8>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
+<script src="resources/test-helpers.js"></script>
+<script src="resources/native-fs-test-helpers.js"></script>
+<script src="resources/messaging-helpers.js"></script>
+<script src="resources/messaging-serialize-helpers.js"></script>
+<script src="script-tests/FileSystemBaseHandle-postMessage-BroadcastChannel.js"></script>
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-BroadcastChannel.tentative.https.manual.window.js b/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-BroadcastChannel.tentative.https.manual.window.js
deleted file mode 100644
index 4bfe84e9c4a..00000000000
--- a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-BroadcastChannel.tentative.https.manual.window.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// META: script=/service-workers/service-worker/resources/test-helpers.sub.js
-// META: script=resources/test-helpers.js
-// META: script=resources/native-fs-test-helpers.js
-// META: script=resources/messaging-helpers.js
-// META: script=resources/messaging-serialize-helpers.js
-// META: script=script-tests/FileSystemBaseHandle-postMessage-BroadcastChannel.js
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-Error-manual.https.tentative.html b/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-Error-manual.https.tentative.html
new file mode 100644
index 00000000000..a503c7e8702
--- /dev/null
+++ b/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-Error-manual.https.tentative.html
@@ -0,0 +1,15 @@
+<!doctype html>
+<meta charset=utf-8>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
+<script src="resources/test-helpers.js"></script>
+<script src="resources/native-fs-test-helpers.js"></script>
+<script src="resources/messaging-helpers.js"></script>
+<script src="resources/messaging-blob-helpers.js"></script>
+<script src="resources/messaging-serialize-helpers.js"></script>
+<script src="script-tests/FileSystemBaseHandle-postMessage-Error.js"></script>
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-Error.tentative.https.manual.window.js b/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-Error.tentative.https.manual.window.js
deleted file mode 100644
index e45271c7793..00000000000
--- a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-Error.tentative.https.manual.window.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// META: script=/common/get-host-info.sub.js
-// META: script=/service-workers/service-worker/resources/test-helpers.sub.js
-// META: script=resources/test-helpers.js
-// META: script=resources/native-fs-test-helpers.js
-// META: script=resources/messaging-helpers.js
-// META: script=resources/messaging-blob-helpers.js
-// META: script=resources/messaging-serialize-helpers.js
-// META: script=script-tests/FileSystemBaseHandle-postMessage-Error.js
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-MessagePort-manual.https.tentative.html b/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-MessagePort-manual.https.tentative.html
new file mode 100644
index 00000000000..4b575766881
--- /dev/null
+++ b/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-MessagePort-manual.https.tentative.html
@@ -0,0 +1,14 @@
+<!doctype html>
+<meta charset=utf-8>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
+<script src="resources/test-helpers.js"></script>
+<script src="resources/native-fs-test-helpers.js"></script>
+<script src="resources/messaging-helpers.js"></script>
+<script src="resources/messaging-blob-helpers.js"></script>
+<script src="resources/messaging-serialize-helpers.js"></script>
+<script src="script-tests/FileSystemBaseHandle-postMessage-MessagePort.js"></script>
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-MessagePort.tentative.https.manual.window.js b/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-MessagePort.tentative.https.manual.window.js
deleted file mode 100644
index 408b32f13a3..00000000000
--- a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-MessagePort.tentative.https.manual.window.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// META: script=/service-workers/service-worker/resources/test-helpers.sub.js
-// META: script=resources/test-helpers.js
-// META: script=resources/native-fs-test-helpers.js
-// META: script=resources/messaging-helpers.js
-// META: script=resources/messaging-blob-helpers.js
-// META: script=resources/messaging-serialize-helpers.js
-// META: script=script-tests/FileSystemBaseHandle-postMessage-MessagePort.js
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-manual.https.tentative.html b/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-manual.https.tentative.html
new file mode 100644
index 00000000000..266238c4acc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage-manual.https.tentative.html
@@ -0,0 +1,14 @@
+<!doctype html>
+<meta charset=utf-8>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
+<script src="resources/test-helpers.js"></script>
+<script src="resources/native-fs-test-helpers.js"></script>
+<script src="resources/messaging-helpers.js"></script>
+<script src="resources/messaging-blob-helpers.js"></script>
+<script src="resources/messaging-serialize-helpers.js"></script>
+<script src="script-tests/FileSystemBaseHandle-postMessage.js"></script>
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage.tentative.https.manual.window.js b/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage.tentative.https.manual.window.js
deleted file mode 100644
index 6045812bff5..00000000000
--- a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemBaseHandle-postMessage.tentative.https.manual.window.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// META: script=/service-workers/service-worker/resources/test-helpers.sub.js
-// META: script=resources/test-helpers.js
-// META: script=resources/native-fs-test-helpers.js
-// META: script=resources/messaging-helpers.js
-// META: script=resources/messaging-blob-helpers.js
-// META: script=resources/messaging-serialize-helpers.js
-// META: script=script-tests/FileSystemBaseHandle-postMessage.js
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemDirectoryHandle-getDirectory-manual.https.tentative.html b/tests/wpt/web-platform-tests/native-file-system/native_FileSystemDirectoryHandle-getDirectory-manual.https.tentative.html
new file mode 100644
index 00000000000..afd95af99d3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/native-file-system/native_FileSystemDirectoryHandle-getDirectory-manual.https.tentative.html
@@ -0,0 +1,10 @@
+<!doctype html>
+<meta charset=utf-8>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="resources/test-helpers.js"></script>
+<script src="resources/native-fs-test-helpers.js"></script>
+<script src="script-tests/FileSystemDirectoryHandle-getDirectory.js"></script>
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemDirectoryHandle-getDirectory.tentative.https.manual.window.js b/tests/wpt/web-platform-tests/native-file-system/native_FileSystemDirectoryHandle-getDirectory.tentative.https.manual.window.js
deleted file mode 100644
index cfe729cd1f1..00000000000
--- a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemDirectoryHandle-getDirectory.tentative.https.manual.window.js
+++ /dev/null
@@ -1,4 +0,0 @@
-// META: script=/resources/testdriver.js
-// META: script=resources/test-helpers.js
-// META: script=resources/native-fs-test-helpers.js
-// META: script=script-tests/FileSystemDirectoryHandle-getDirectory.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemDirectoryHandle-getEntries-manual.https.tentative.html b/tests/wpt/web-platform-tests/native-file-system/native_FileSystemDirectoryHandle-getEntries-manual.https.tentative.html
new file mode 100644
index 00000000000..858bf02f1fa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/native-file-system/native_FileSystemDirectoryHandle-getEntries-manual.https.tentative.html
@@ -0,0 +1,10 @@
+<!doctype html>
+<meta charset=utf-8>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="resources/test-helpers.js"></script>
+<script src="resources/native-fs-test-helpers.js"></script>
+<script src="script-tests/FileSystemDirectoryHandle-getEntries.js"></script>
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemDirectoryHandle-getEntries.tentative.https.manual.window.js b/tests/wpt/web-platform-tests/native-file-system/native_FileSystemDirectoryHandle-getEntries.tentative.https.manual.window.js
deleted file mode 100644
index f27a44d1245..00000000000
--- a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemDirectoryHandle-getEntries.tentative.https.manual.window.js
+++ /dev/null
@@ -1,4 +0,0 @@
-// META: script=/resources/testdriver.js
-// META: script=resources/test-helpers.js
-// META: script=resources/native-fs-test-helpers.js
-// META: script=script-tests/FileSystemDirectoryHandle-getEntries.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemDirectoryHandle-getFile-manual.https.tentative.html b/tests/wpt/web-platform-tests/native-file-system/native_FileSystemDirectoryHandle-getFile-manual.https.tentative.html
new file mode 100644
index 00000000000..085d4371c48
--- /dev/null
+++ b/tests/wpt/web-platform-tests/native-file-system/native_FileSystemDirectoryHandle-getFile-manual.https.tentative.html
@@ -0,0 +1,10 @@
+<!doctype html>
+<meta charset=utf-8>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="resources/test-helpers.js"></script>
+<script src="resources/native-fs-test-helpers.js"></script>
+<script src="script-tests/FileSystemDirectoryHandle-getFile.js"></script>
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemDirectoryHandle-getFile.tentative.https.manual.window.js b/tests/wpt/web-platform-tests/native-file-system/native_FileSystemDirectoryHandle-getFile.tentative.https.manual.window.js
deleted file mode 100644
index 0455cb80091..00000000000
--- a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemDirectoryHandle-getFile.tentative.https.manual.window.js
+++ /dev/null
@@ -1,4 +0,0 @@
-// META: script=/resources/testdriver.js
-// META: script=resources/test-helpers.js
-// META: script=resources/native-fs-test-helpers.js
-// META: script=script-tests/FileSystemDirectoryHandle-getFile.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemDirectoryHandle-removeEntry-manual.https.tentative.html b/tests/wpt/web-platform-tests/native-file-system/native_FileSystemDirectoryHandle-removeEntry-manual.https.tentative.html
new file mode 100644
index 00000000000..cedb87587ce
--- /dev/null
+++ b/tests/wpt/web-platform-tests/native-file-system/native_FileSystemDirectoryHandle-removeEntry-manual.https.tentative.html
@@ -0,0 +1,10 @@
+<!doctype html>
+<meta charset=utf-8>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="resources/test-helpers.js"></script>
+<script src="resources/native-fs-test-helpers.js"></script>
+<script src="script-tests/FileSystemDirectoryHandle-removeEntry.js"></script>
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemDirectoryHandle-removeEntry.tentative.https.manual.window.js b/tests/wpt/web-platform-tests/native-file-system/native_FileSystemDirectoryHandle-removeEntry.tentative.https.manual.window.js
deleted file mode 100644
index 8905a7afdea..00000000000
--- a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemDirectoryHandle-removeEntry.tentative.https.manual.window.js
+++ /dev/null
@@ -1,4 +0,0 @@
-// META: script=/resources/testdriver.js
-// META: script=resources/test-helpers.js
-// META: script=resources/native-fs-test-helpers.js
-// META: script=script-tests/FileSystemDirectoryHandle-removeEntry.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemFileHandle-getFile-manual.https.tentative.html b/tests/wpt/web-platform-tests/native-file-system/native_FileSystemFileHandle-getFile-manual.https.tentative.html
new file mode 100644
index 00000000000..5a0b1d97b05
--- /dev/null
+++ b/tests/wpt/web-platform-tests/native-file-system/native_FileSystemFileHandle-getFile-manual.https.tentative.html
@@ -0,0 +1,10 @@
+<!doctype html>
+<meta charset=utf-8>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="resources/test-helpers.js"></script>
+<script src="resources/native-fs-test-helpers.js"></script>
+<script src="script-tests/FileSystemFileHandle-getFile.js"></script>
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemFileHandle-getFile.tentative.https.manual.window.js b/tests/wpt/web-platform-tests/native-file-system/native_FileSystemFileHandle-getFile.tentative.https.manual.window.js
deleted file mode 100644
index 16c68c59b27..00000000000
--- a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemFileHandle-getFile.tentative.https.manual.window.js
+++ /dev/null
@@ -1,4 +0,0 @@
-// META: script=/resources/testdriver.js
-// META: script=resources/test-helpers.js
-// META: script=resources/native-fs-test-helpers.js
-// META: script=script-tests/FileSystemFileHandle-getFile.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemWritableFileStream-manual.https.tentative.html b/tests/wpt/web-platform-tests/native-file-system/native_FileSystemWritableFileStream-manual.https.tentative.html
new file mode 100644
index 00000000000..56ff51cd05a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/native-file-system/native_FileSystemWritableFileStream-manual.https.tentative.html
@@ -0,0 +1,10 @@
+<!doctype html>
+<meta charset=utf-8>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="resources/test-helpers.js"></script>
+<script src="resources/native-fs-test-helpers.js"></script>
+<script src="script-tests/FileSystemWritableFileStream.js"></script>
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemWritableFileStream-piped-manual.https.tentative.html b/tests/wpt/web-platform-tests/native-file-system/native_FileSystemWritableFileStream-piped-manual.https.tentative.html
new file mode 100644
index 00000000000..f6c6e6009aa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/native-file-system/native_FileSystemWritableFileStream-piped-manual.https.tentative.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<meta charset=utf-8>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="resources/test-helpers.js"></script>
+<script src="resources/native-fs-test-helpers.js"></script>
+<script src="../streams/resources/recording-streams.js"></script>
+<script src="script-tests/FileSystemWritableFileStream-piped.js"></script>
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemWritableFileStream-piped.tentative.https.manual.window.js b/tests/wpt/web-platform-tests/native-file-system/native_FileSystemWritableFileStream-piped.tentative.https.manual.window.js
deleted file mode 100644
index 2c0299df12e..00000000000
--- a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemWritableFileStream-piped.tentative.https.manual.window.js
+++ /dev/null
@@ -1,4 +0,0 @@
-// META: script=/resources/testdriver.js
-// META: script=resources/test-helpers.js
-// META: script=resources/native-fs-test-helpers.js
-// META: script=script-tests/FileSystemWritableFileStream-piped.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemWritableFileStream-write-manual.https.tentative.html b/tests/wpt/web-platform-tests/native-file-system/native_FileSystemWritableFileStream-write-manual.https.tentative.html
new file mode 100644
index 00000000000..280edc27e5a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/native-file-system/native_FileSystemWritableFileStream-write-manual.https.tentative.html
@@ -0,0 +1,10 @@
+<!doctype html>
+<meta charset=utf-8>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="resources/test-helpers.js"></script>
+<script src="resources/native-fs-test-helpers.js"></script>
+<script src="script-tests/FileSystemWritableFileStream-write.js"></script>
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemWritableFileStream-write.tentative.https.manual.window.js b/tests/wpt/web-platform-tests/native-file-system/native_FileSystemWritableFileStream-write.tentative.https.manual.window.js
deleted file mode 100644
index 0efacf9e607..00000000000
--- a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemWritableFileStream-write.tentative.https.manual.window.js
+++ /dev/null
@@ -1,4 +0,0 @@
-// META: script=/resources/testdriver.js
-// META: script=resources/test-helpers.js
-// META: script=resources/native-fs-test-helpers.js
-// META: script=script-tests/FileSystemWritableFileStream-write.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemWritableFileStream.tentative.https.manual.window.js b/tests/wpt/web-platform-tests/native-file-system/native_FileSystemWritableFileStream.tentative.https.manual.window.js
deleted file mode 100644
index caf6fbd1c52..00000000000
--- a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemWritableFileStream.tentative.https.manual.window.js
+++ /dev/null
@@ -1,4 +0,0 @@
-// META: script=/resources/testdriver.js
-// META: script=resources/test-helpers.js
-// META: script=resources/native-fs-test-helpers.js
-// META: script=script-tests/FileSystemWritableFileStream.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemWriter-manual.https.tentative.html b/tests/wpt/web-platform-tests/native-file-system/native_FileSystemWriter-manual.https.tentative.html
new file mode 100644
index 00000000000..fbfbd301e16
--- /dev/null
+++ b/tests/wpt/web-platform-tests/native-file-system/native_FileSystemWriter-manual.https.tentative.html
@@ -0,0 +1,10 @@
+<!doctype html>
+<meta charset=utf-8>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="resources/test-helpers.js"></script>
+<script src="resources/native-fs-test-helpers.js"></script>
+<script src="script-tests/FileSystemWriter.js"></script>
diff --git a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemWriter.tentative.https.manual.window.js b/tests/wpt/web-platform-tests/native-file-system/native_FileSystemWriter.tentative.https.manual.window.js
deleted file mode 100644
index 25d8ee99585..00000000000
--- a/tests/wpt/web-platform-tests/native-file-system/native_FileSystemWriter.tentative.https.manual.window.js
+++ /dev/null
@@ -1,4 +0,0 @@
-// META: script=/resources/testdriver.js
-// META: script=resources/test-helpers.js
-// META: script=resources/native-fs-test-helpers.js
-// META: script=script-tests/FileSystemWriter.js
diff --git a/tests/wpt/web-platform-tests/native-file-system/resources/native-fs-test-helpers.js b/tests/wpt/web-platform-tests/native-file-system/resources/native-fs-test-helpers.js
index bcdfd484cf2..d8137c39940 100644
--- a/tests/wpt/web-platform-tests/native-file-system/resources/native-fs-test-helpers.js
+++ b/tests/wpt/web-platform-tests/native-file-system/resources/native-fs-test-helpers.js
@@ -12,6 +12,10 @@ const directory_promise = (async () => {
     window.addEventListener('DOMContentLoaded', resolve);
   });
 
+  // Small delay to give chrome's test automation a chance to actually install
+  // itself.
+  await new Promise(resolve => step_timeout(resolve, 100))
+
   await window.test_driver.bless(
       'show a file picker.<br />Please select an empty directory');
   const entries = await self.chooseFileSystemEntries({type: 'open-directory'});
diff --git a/tests/wpt/web-platform-tests/navigation-timing/idlharness.window.js b/tests/wpt/web-platform-tests/navigation-timing/idlharness.window.js
index 8cc3546b3c2..504453b9aff 100644
--- a/tests/wpt/web-platform-tests/navigation-timing/idlharness.window.js
+++ b/tests/wpt/web-platform-tests/navigation-timing/idlharness.window.js
@@ -5,17 +5,24 @@
 
 // http://www.w3.org/TR/navigation-timing/
 
-idl_test(
-  ['navigation-timing'],
-  ['resource-timing', 'performance-timeline', 'hr-time', 'dom'],
-  idl_array => {
-    idl_array.add_objects({
-      Performance: ['performance'],
-      PerformanceNavigation: ['performance.navigation'],
-      PerformanceTiming: ['performance.timing'],
-      PerformanceNavigationTiming: [
-        'performance.getEntriesByType("navigation")[0]'
-      ]
-    });
-  }
-);
+promise_test(async (t) => {
+  const srcs = ['navigation-timing', 'hr-time', 'resource-timing', 'performance-timeline', 'dom', 'html'];
+  const [navigationTiming, hrTime, resourceTiming, performanceTimeline, dom, html] =
+      await Promise.all(srcs.map(i => fetch(`/interfaces/${i}.idl`).then(r => r.text())));
+  const idlArray = new IdlArray();
+  idlArray.add_idls(hrTime);
+  idlArray.add_idls(navigationTiming);
+  idlArray.add_dependency_idls(resourceTiming);
+  idlArray.add_dependency_idls(performanceTimeline);
+  idlArray.add_dependency_idls(dom);
+  idlArray.add_dependency_idls(html);
+  idlArray.add_objects({
+    Performance: ['performance'],
+    PerformanceNavigation: ['performance.navigation'],
+    PerformanceTiming: ['performance.timing'],
+    PerformanceNavigationTiming: [
+      'performance.getEntriesByType("navigation")[0]'
+    ]
+  });
+  return idlArray.test();
+})
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html
index 7269ca1b26d..c44fee3779a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html
index cc10001e1af..3b4ef7ebe0e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html
index c4778882c09..43eaa248162 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html
index e412e74f879..f742a56db89 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html
index fedb3811d2e..913ad186493 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html
index d96a1d081c1..844e13e1240 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html
index 694e8a328d9..e98b08159c2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html
index 22fe67a1868..fafc95e951a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html
index d59ed7d953b..239e995b1d6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html
index 7d333bd1f0e..c301a60c511 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html
index 6d74fa96419..3bec1166bb5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html
index 80163171ec9..7345a7fa474 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html
index 2b27dd5fa70..bb229dd9398 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html
index d6d4d6bb9d0..3020fe48cad 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html
index c7a32e5d0ee..58d9c553e07 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html
index 04131b2b335..1f884e98d46 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
index 91217a1b1f5..ce0748b7304 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
index 0c9f3b9a3d7..1febea391c1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
index 884b9eb1726..6c2c49c660b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
index 4012b20f7c3..01a012540b0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
index fdc199880de..b966bcb7d74 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
index 7c9fece456b..45da014db79 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
index 7cbfb80140a..443ddf03354 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
index 1f01d72ebbf..fd22285abde 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
index 16ec9ba4d28..17e8baacc47 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
index 27b073035aa..d0dc648bf05 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
index 5d5b14f4926..f3ac8e18f1f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
index 7db51dbe340..d425a1f5029 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html
index c8270f896ec..e0178946d8e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html
index da7d8dc24c4..2555b7afebe 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html
index 908637bc501..a4e61555ffc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html
index 2407b76de64..d29b9f372c2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html
index bab2a50944b..e30b8b3e7dd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html
index 8d3a921c4ac..bd33928a418 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html
index 59e03982a27..fb3ba0e6933 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html
index 6c44ba0e6a3..d3458df7f0b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html
index 3e74519b4bc..ea91563734a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html
index 7a016b222fe..95388c33279 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html
index 64d75afb49a..298d1d1b7ef 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html
index 8d0f21bd0c6..4e35f806fba 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/a-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/a-tag/cross-http.no-redirect.http.html
index 7414c8e633b..5a974e5142e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/a-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/a-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/a-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/a-tag/cross-https.no-redirect.http.html
index 461d2fe43bb..e1f171c4cf2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/a-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/a-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/a-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/a-tag/same-http.no-redirect.http.html
index 364c688a281..6b6560ccde7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/a-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/a-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/a-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/a-tag/same-https.no-redirect.http.html
index 8de257c500b..aac77a683ba 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/a-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/a-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.keep-origin.http.html
index dcb7c8b4c39..4b9d88c1c14 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.no-redirect.http.html
index 99a5e73d064..2c5ff6d24d7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.swap-origin.http.html
index 4c394755f51..8608779f796 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.keep-origin.http.html
index 523da932527..f182c76f330 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.no-redirect.http.html
index 0c65dd3bee3..a0cbaf7997c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.swap-origin.http.html
index 50fb9baa4fc..e2df19f2ca0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.keep-origin.http.html
index 8946cc15a12..74206f4af73 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.no-redirect.http.html
index 4037c2fb743..9f3b43ffeaa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.swap-origin.http.html
index d9c17d636ed..a9dda250ca7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.keep-origin.http.html
index 8e64d48c83c..49e18c3f2cf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.no-redirect.http.html
index d55ac0bef0f..affc33d286f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.swap-origin.http.html
index 1acc09e2c2d..053f4a6924d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.keep-origin.http.html
index 6242aaa9a38..150548dffd4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.no-redirect.http.html
index 2016094423a..4b7f7186e2b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.swap-origin.http.html
index 4c905c16579..0b4ab2e534a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.keep-origin.http.html
index d62e9c01292..09b2d692cef 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.no-redirect.http.html
index 1b77a0cf85e..804384aed19 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.swap-origin.http.html
index 40d2cff83b6..25b0ae35817 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.keep-origin.http.html
index 817abb90d8a..84146616d19 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.no-redirect.http.html
index 7d769f3d141..d7cc5636c64 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.swap-origin.http.html
index 2ba0de6dfe2..7ad57b6b4fe 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.keep-origin.http.html
index eda665dd946..fcaec9cdd63 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.no-redirect.http.html
index 445aa4dc852..3cc2cedf87c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.swap-origin.http.html
index 455c57ddc2f..9894edc7701 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.keep-origin.http.html
index ecdf4bdcc2d..171dd12732c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.no-redirect.http.html
index ad33e3c9e1c..ed1b6c74dd0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.swap-origin.http.html
index 11851635644..7cc3f5af651 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.keep-origin.http.html
index 34ab7265257..d33fbb45400 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.no-redirect.http.html
index 7e54f365919..6b5a967560c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.swap-origin.http.html
index f7d5dd5c3ed..b95304308f3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.keep-origin.http.html
index f98f0455aaa..bd64cb26715 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.no-redirect.http.html
index a9f08ff0780..5eb920b2db8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.swap-origin.http.html
index 88c43cf7067..f22781e81c8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.keep-origin.http.html
index 7336f7f4ca3..6135f65a5be 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.no-redirect.http.html
index 787b4a2ff3c..dcfa5b02ddb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.swap-origin.http.html
index 4277eb4be02..e2d56eb61cf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html
index e7526ed42b2..8b1b2a43120 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html
index ffd8de6743f..f29fb4bba1c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html
index 845056de54d..220f8abb260 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html
index 0000efd20a8..4d184fa1992 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html
index b84d1d8760f..8260e81eb42 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html
index cb44bb09dad..cb89e64d209 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html
index 2ac5dc65c37..0a9f5674ba0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html
index eb22b5280bc..e7a54248f5c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html
index b986b32cb61..94da78b1553 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html
index 59e06f468dc..22397a90b1b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html
index d13cccd3637..db0ad8b0b21 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html
index c355707ad51..7d93d07ae5a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html
index becbb554fff..9d2819f6ee5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html
index 584875a8ca4..635ddb24ea8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html
index 3a18143a184..cc3ed504053 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html
index 2c9c5689460..5c64af45705 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
index 21643724a49..1ad788064a4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
index 52b471e48c9..b233a53e8b8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
index cfba1967b2d..2bcd1db97dc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
index e94dfaa4e49..91b6e99edbd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
index 89446bf752b..8a24d43aa59 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
index 1946d0a2f7e..209978e3935 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
index a41f9c33fa7..270af5b66cd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
index 60fb6ad3377..e99dd16221c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
index bebc7b51680..599e7c1a9f5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
index ba8139583fd..0accc8042d3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
index 5aa87fe3ec7..48bdfc47c30 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
index 6480f77d1ca..98ba7cbc5f2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html
index bc09370307c..c179cb9daa8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html
index 1e408c3702f..335eb306d16 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html
index 3faca3ec745..e7992c5fa43 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html
index 8b91e88211a..be259c735ea 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html
index e3d695f0316..36794c291e6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html
index 415c63aaf32..5bc56aada0a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html
index b175b501b3f..a2456dae170 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html
index 980f9fe5195..2bcad4b870d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html
index c1fc591386b..598bfaae10c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html
index a3eade8bace..7714855f343 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html
index 5368c70113c..01d76e15dfb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html
index 4e41cc2b99e..b9390a5c599 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/a-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/a-tag/cross-http.no-redirect.http.html
index 6a499acc7c1..9d9b1bdf662 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/a-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/a-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/a-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/a-tag/cross-https.no-redirect.http.html
index e2a69816bb7..f162894e796 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/a-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/a-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/a-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/a-tag/same-http.no-redirect.http.html
index 83b4dec24cd..0b313b05257 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/a-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/a-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/a-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/a-tag/same-https.no-redirect.http.html
index 03f7ee3ea9a..0128704e514 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/a-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/a-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.keep-origin.http.html
index 7e1d06ba4cb..00761ad73cb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.no-redirect.http.html
index ebcf7098524..f1cae87b0a2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.swap-origin.http.html
index a7c55c2bb8a..62ae86ebbba 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.keep-origin.http.html
index 9715246e6b9..c93a1b17925 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.no-redirect.http.html
index 53565249109..3fd1d70d840 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.swap-origin.http.html
index a8d20be3e52..abe9474d69a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.keep-origin.http.html
index 67087b4a2f7..5d7d67b05b1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.no-redirect.http.html
index 26f80cdb3f9..319a779d9f2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.swap-origin.http.html
index 1cd4e595610..e13bef6dd3a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.keep-origin.http.html
index 354e69c6e2f..63adf811f6e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.no-redirect.http.html
index 6306053db22..75586b60e72 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.swap-origin.http.html
index 3aafb5ab78c..712f03f877e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-http.keep-origin.http.html
index 3067e3d6573..8ce106cef9f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-http.no-redirect.http.html
index 15776d7aabc..5675244ed7d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-http.swap-origin.http.html
index c4876ce475f..931513b3050 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-https.keep-origin.http.html
index 916e625b5af..5e4f20c5685 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-https.no-redirect.http.html
index 22a136b8ff2..0083ce1dbe7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-https.swap-origin.http.html
index 795ea314275..122d9db4e3f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-http.keep-origin.http.html
index aa74072ca00..2b1ad4e9809 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-http.no-redirect.http.html
index 32ae9474d96..7380faa3f19 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-http.swap-origin.http.html
index 4938c5f49bb..d2bec8fdb4a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-https.keep-origin.http.html
index b298ce7b893..d6a5bbab61d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-https.no-redirect.http.html
index 4a768077cf4..ab218846c11 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-https.swap-origin.http.html
index 7fa0b3d1a0e..b54fd752874 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-http.keep-origin.http.html
index 8ede2b4197f..2cbb8d5fa9f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-http.no-redirect.http.html
index c3a7d773bc3..26876438a6f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-http.swap-origin.http.html
index d6417c69efd..430d1d6a946 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-https.keep-origin.http.html
index 26f266bdd3f..3378092acc9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-https.no-redirect.http.html
index 736342479f3..be20f467dc5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-https.swap-origin.http.html
index 9f713c50136..bc0087c1314 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-http.keep-origin.http.html
index 6e3d7246ab8..8ad0755180b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-http.no-redirect.http.html
index 04ba8e7d4af..eef9696f9eb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-http.swap-origin.http.html
index 328bbc01bbc..54f0164bee4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-https.keep-origin.http.html
index a87ad9b9b21..3c64bb16efb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-https.no-redirect.http.html
index c7c88ff222f..15f5ac3dbf9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-https.swap-origin.http.html
index 80cd677c0db..f6086fdf270 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/a-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/a-tag/cross-http.no-redirect.http.html
index c132af5e9e9..3e5532b52f2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/a-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/a-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/a-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/a-tag/cross-https.no-redirect.http.html
index b00a34e07ec..573cde548bb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/a-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/a-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/a-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/a-tag/same-http.no-redirect.http.html
index 0daede6e655..cd85233e2aa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/a-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/a-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.keep-origin.http.html
index e498846d95b..fed49b99298 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.no-redirect.http.html
index 90d39202d50..3ef48104652 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.swap-origin.http.html
index 596d3da28dd..8e73234772d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.keep-origin.http.html
index 45ff588abb3..8aef178125c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.no-redirect.http.html
index bb6f769acbf..b44ea318831 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.swap-origin.http.html
index a825c3bc179..53e57b9f1cd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.keep-origin.http.html
index b4d54468708..03022ade244 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.no-redirect.http.html
index ddf2d81f900..4d52accfa41 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.swap-origin.http.html
index 10e31413773..5c13d6d9929 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-https.swap-origin.http.html
index 7f82d17b46b..a9022228931 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.keep-origin.http.html
index ac8d2f6cf3a..937365ce559 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.no-redirect.http.html
index ccaeff2096a..dfb394b72d8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.swap-origin.http.html
index e831f577b6e..c526d6bfe4a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.keep-origin.http.html
index a8f6e1fffb5..57610c1eb78 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.no-redirect.http.html
index e46908ace43..fe450105df6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.swap-origin.http.html
index 9f818b1e1a8..15cbf00cd1e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-http.keep-origin.http.html
index 6b953dff155..7b9cf7816a2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-http.no-redirect.http.html
index e452225b58b..def3201c00c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-http.swap-origin.http.html
index 43736c1cc48..d989feecc88 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-https.swap-origin.http.html
index a786c73b0a6..c2f6fd8358e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.keep-origin.http.html
index ee30862a973..068e98a40bb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.no-redirect.http.html
index aea1e262c60..e3b6aaafa7e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.swap-origin.http.html
index fd2c8b97ce1..e2cd2fb6846 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.keep-origin.http.html
index 2a3a5ca9897..2df9945825a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.no-redirect.http.html
index 3c7dc4e66aa..33d92f25212 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.swap-origin.http.html
index 6048d78bdb3..9f33d1c4d5d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-http.keep-origin.http.html
index 1bf3ab30f6b..030faa9691d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-http.no-redirect.http.html
index 31e1c71a682..57ce65ba5ab 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-http.swap-origin.http.html
index 15d8229a683..cd28b806852 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-https.swap-origin.http.html
index bf6268411a9..696ede16efd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html
index aea84a0db2e..325ce556409 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html
index 0994a345db0..c196fb02e2a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html
index bb0dc705be8..5b650463733 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html
index d899449ff73..cb23c09dc4b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html
index b66b1b01428..b2694ba3bce 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html
index ec985b1804e..6248afd88ed 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html
index e597c1dec07..5b04e9f7db3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html
index e932d3cd3f1..9cb21a406d1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html
index 83f05ada593..ba995602ca6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html
index 23c8ba77856..7538d3b323a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html
index d63e2f8ab09..e8b1a64dd60 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html
index 6e266233bb1..7da4311182f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html
index c4ae13388b9..4d2d67e9e9d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html
index 5cf1e2fe3e1..9cbeb0b6cad 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html
index 0ac920f1482..7e49773117b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html
index f6dd7e9f0b3..294e449e55b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
index a69f7cb4a23..e4f989d7af4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
index 35d1a5c941a..c6070e68795 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
index b4dd950391b..e65abe56702 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
index 1872f9e76cf..492cfa1dd3a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
index f27cb2dc197..99342cd5f2d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
index cf687c5d3f9..5ef973da845 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
index 9e01d7b1bb8..50542680131 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
index 06ce423ad62..888f6b035eb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
index e7a6839a096..ee84fa635ac 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
index eac87cd5179..d9d2f5fc965 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
index f03eef84183..7c297e28c32 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
index 15714477f8e..49c6b5717d7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html
index bc00f9f8093..a8fb6ef5148 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html
index eab14c17716..b19373043b8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html
index 6a100c67e70..161b2d59484 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html
index c02c82a7d2d..9e7fa6a432c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html
index c9886904738..8ca02232be2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html
index 3f8a555d7ee..88382eb0f81 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html
index f722ac89a7d..0be2f856b9d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html
index b73d5f4f297..adf5eaf5ea8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html
index 116775c576e..c387986f3c3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html
index e239c323e67..f2e617ce5a9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html
index 0562e65dbd9..4c997eb2c86 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html
index 8b4e58faeb1..78295c33fe6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/a-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/a-tag/cross-http.no-redirect.http.html
index 8b976a674f2..bd605239a47 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/a-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/a-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/a-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/a-tag/cross-https.no-redirect.http.html
index 5673e9b451c..1752200d26a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/a-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/a-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/a-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/a-tag/same-http.no-redirect.http.html
index 735f518ac55..6dd3cdfe87f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/a-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/a-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/a-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/a-tag/same-https.no-redirect.http.html
index cef1d596319..622ec8dd2d3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/a-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/a-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.keep-origin.http.html
index be5d9d7d80f..8c34508b4c5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.no-redirect.http.html
index 2902ab2ed42..bae4e263900 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.swap-origin.http.html
index 6beef102008..5baa0abc9ad 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.keep-origin.http.html
index 2d1a59457ef..78a9ed73b86 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.no-redirect.http.html
index 4c024eaa5c3..02f50c15c9f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.swap-origin.http.html
index a1b105c0f76..da8f02835e7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.keep-origin.http.html
index 482e55d4ece..8706697dec7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.no-redirect.http.html
index 25a79af6819..389acd12fbf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.swap-origin.http.html
index ddc5e1120d6..477c7e0e7c9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.keep-origin.http.html
index 57d41772cf9..a11c209f177 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.no-redirect.http.html
index d1921eb211c..7007de57a61 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.swap-origin.http.html
index f40f2eaf673..b0a5a73e371 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.keep-origin.http.html
index 9e6ab78b9bc..f2af0cdd239 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.no-redirect.http.html
index a0812e5b044..7ebadca3993 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.swap-origin.http.html
index f68375a2c18..c944ba31a08 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.keep-origin.http.html
index 0aa611098f9..9e7d4416168 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.no-redirect.http.html
index 699c949d1c2..4c98969ce1b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.swap-origin.http.html
index edcb7e6fc8b..c7bdb8fca03 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.keep-origin.http.html
index 280d9773dc9..2064a113927 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.no-redirect.http.html
index d79049c2dc4..46615b08847 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.swap-origin.http.html
index b1287ef39fa..b575c0f76f9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.keep-origin.http.html
index f98975f3ddf..4bfef3725c0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.no-redirect.http.html
index 85afeed9eba..0aabad4311a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.swap-origin.http.html
index 15f1638f970..edb3036eff8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.keep-origin.http.html
index f95dec72e05..826028837a1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.no-redirect.http.html
index 67bc6a27f08..944014e9552 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.swap-origin.http.html
index 747ee1a2a87..2c5dc87afc2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.keep-origin.http.html
index 31911f764e0..0d2d6e2c5bc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.no-redirect.http.html
index ea5cf7313f3..7b29aa477be 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.swap-origin.http.html
index efbf5f7fbab..0dab8adc777 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.keep-origin.http.html
index 91a80a43818..4b87d5ce52c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.no-redirect.http.html
index 99b1133e510..2accd88f028 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.swap-origin.http.html
index ebcce314297..1ddbaac9928 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.keep-origin.http.html
index dc1687f9660..d1f6dc24c65 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.no-redirect.http.html
index 51b104eb434..727c7352ab0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.swap-origin.http.html
index 8f4e1a60fa0..da7cf0d38f6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/cross-http.no-redirect.http.html
index 30dc74a8394..fd9dd2cee91 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/cross-https.no-redirect.http.html
index 7440fb41e24..88ce8ceed90 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/same-http.no-redirect.http.html
index c6ecdd72b94..b1cef331393 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/same-https.no-redirect.http.html
index 83bf18cc55f..637521db6e9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.keep-origin.http.html
index 6a0e12fbfea..24e85ddcdcf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.no-redirect.http.html
index 927d42549dc..75376cf6146 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.swap-origin.http.html
index 04b8b648f8a..75fb99ce09f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.keep-origin.http.html
index 5991dea7169..f7138b97558 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.no-redirect.http.html
index 08b98abf5f3..d5a25909c07 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.swap-origin.http.html
index f55dbf24c21..2229e59ec07 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.keep-origin.http.html
index a072402183a..5db085795a4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.no-redirect.http.html
index 183cdcc2bd6..44351d534fc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.swap-origin.http.html
index 1cdacdbcb47..913cb289a28 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.keep-origin.http.html
index 2b936140ca2..76ad177546b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.no-redirect.http.html
index 2b86b1abafa..8e43576efc9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.swap-origin.http.html
index c20095f114c..a1b580de8fb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.keep-origin.http.html
index ef9c8061684..b33395f3732 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.no-redirect.http.html
index 66c1237f807..c70df3e35b7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.swap-origin.http.html
index 82264806897..2f7ed240400 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.keep-origin.http.html
index bcd8e106913..d7ead3adb07 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.no-redirect.http.html
index d31c60c253b..1e49b665814 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.swap-origin.http.html
index 53593ca4db1..30b7794bae3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.keep-origin.http.html
index 55d4f02cc4f..768d6ae83df 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.no-redirect.http.html
index 970f734cc72..6675a82864e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.swap-origin.http.html
index 402e089288d..85e5b3d4365 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.keep-origin.http.html
index 755b80e6743..0245978ae24 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.no-redirect.http.html
index df3a93a736e..4c6d9d947d8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.swap-origin.http.html
index 4e1ba92a660..d07f71df207 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.keep-origin.http.html
index 1404cb50cf6..d0e4ac8fa12 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.no-redirect.http.html
index 7c3fe13e261..16636872c02 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.swap-origin.http.html
index 749e5963912..e1ac5e29da6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.keep-origin.http.html
index 83a82e30cc6..96f7eb9705d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.no-redirect.http.html
index 49b86fb31ee..a923529a17e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.swap-origin.http.html
index 6d04bf37d00..e27f8e54fba 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.keep-origin.http.html
index a0fb08ea0b9..ce44913a5ef 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.no-redirect.http.html
index 10b61b10295..9c39758a01a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.swap-origin.http.html
index 787f55ff212..5d7cdfa8d5d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.keep-origin.http.html
index 6d379ea9c77..333a9f0dfba 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.no-redirect.http.html
index 20d6a05ecd8..cad091685b3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.swap-origin.http.html
index d14f4b465cf..d0dac9ebd24 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
index 6fcc2e48410..ee374dbf768 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
index 12e41301c94..f07855ee68e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
index e9da6d9e804..0bbd1f69006 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
index ab80ee87cbd..a1245147938 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
index fbde28cf9ce..1ed2c9b5505 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
index 5acd29b8158..c67304f7408 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
index bed037e0617..3b1075f8a29 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
index d33cdb5c99b..7dbd2db9326 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
index 2d81ef0fd42..381020458cf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
index 248935bd6f1..d0e645740e6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
index 029653aa7a9..e2a92885d69 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
index b316385e017..b6bea77b14b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html
index 3dcdae2799d..a13393de325 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html
index 54e35080fef..2d98e36788b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html
index a12aba37ee9..dbdcf2f9939 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html
index 75a3ffdc15e..4caf1ae86b5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html
index 6cc9885e30a..2758b19eb7b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html
index 4a167e2691f..cfcc2e04ba1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html
index 5f3f07329ca..88610a132c2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html
index 917e3df21a1..7b6ddfe88fc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html
index 3aaa4bb2ebc..72280322d99 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html
index 4af2bcabd55..96547002838 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html
index 92ec80bf7b2..281966fc330 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html
index 4004fe51dec..6ea37da5a20 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
index 5271514501f..67073e8b4a8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
index 2e1d92a34ae..f5796dc7ec5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
index ada402d0dfd..c7a33cd1af5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
index fc8fe6678dd..14ca80dcbd6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
index 4fca6e923c5..6780c2af124 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
index 14fca890bd2..27da471a076 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
index e265aade7ce..8f4f9d2156f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
index 0f91cfcee72..c00ffbcfedb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
index ecd2cedd808..9e6f4549c7c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
index 7f67bbb8af9..36d65e21aff 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
index 0e5ad8a433f..81fb47c872d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
index 5f53a1ab6bd..e8ea9b35ee0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.keep-origin.http.html
index 7bf766f7079..247a4419aa7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.no-redirect.http.html
index 2499907edcd..0fdbc84123c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.swap-origin.http.html
index df82c1d6077..7600c3861e9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.keep-origin.http.html
index b01e532a957..501653ea807 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.no-redirect.http.html
index 35bdacc127e..f9a475e9826 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.swap-origin.http.html
index 1308365f066..6922e02e9cc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.keep-origin.http.html
index 2829b4d582b..0c9d34a9f48 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.no-redirect.http.html
index ffae5396c18..9f1d2a8b3ad 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.swap-origin.http.html
index cc9d8e8bf76..6cd4fb74815 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.keep-origin.http.html
index 9ad407a5043..1ec5f02f719 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.no-redirect.http.html
index 99b61473a4a..2bf9d443bcb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.swap-origin.http.html
index 870752b1528..86e619b3f7f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html
index 60f1ea68215..dcf44f75b48 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html
index e23fab8d843..effc5f81516 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html
index c4c588c6892..d0cd5e0abdc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html
index 852b1235372..1f01ba13835 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html
index 905270aaa73..c028b78a476 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html
index faa4c95cfd8..b314058597f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.keep-origin.http.html
index 33f945060b7..87ea9f082da 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.no-redirect.http.html
index 94de2118260..d009c2b4aed 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.swap-origin.http.html
index b830abc6ce6..cd91112d528 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-https.swap-origin.http.html
index 56802e32559..6efa1dc5656 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
index 1c3f7101333..c05839c7d52 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
index 42d5bb7ee1c..f7434f91cd8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
index 68dcf2c4d32..da127b6dd12 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
index da2ccc576a2..bb222956dae 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
index 5f461dd44bc..2b4c9acd80c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
index 8b5ca0cb32d..6534263de02 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
index 02e82e344e0..1d2003410aa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
index 9974b08f905..e7228161351 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
index 71255af62be..3bd8c2a6b37 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
index 7627c324277..3d88338d55a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
index 588c39a8a74..4b84b70673b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
index 9374e472301..cceca42b52f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html
index 27f377b5479..f5bc1f0282c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html
index 3073e88ca22..050e8740045 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html
index cb7947261a6..14b3b906afa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html
index 71af3259014..3cc34473467 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html
index 81d8cd1a670..01a026681f1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html
index fc3807c8f53..573a019bb8f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html
index 86a50df759b..99414a5e9d4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html
index c6e0d030233..fcf931ca354 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html
index 5d536fc2d2b..caabd002d30 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html
index 74bd3a07ffd..6b7e6a80b04 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html
index d21bc0c63a2..997119a03c9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html
index 6b265bff090..0a4d8e06b8d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html
index 8813bd80517..6680d9a8109 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html
index 8465399f8e6..c0f490f4ad6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html
index 13645cd4ff9..04a8cdcf1e5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html
index a669d0a024d..f25896a4d99 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html
index cedbee9f67f..119db9da9a0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html
index 5b2dba40f94..24fab1eec6e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html
index 909b92bfd50..80d28c9ab4c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html
index 4c207021bb7..1cfb75020a0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html
index a8eb7fe9173..e72ba1547c2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html
index d131ac349dd..bfeb494d66f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html
index 83d055f7067..9ed0e1bf52c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html
index a8570a0ace0..f976183aacc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.keep-origin.http.html
index 6f7a990c362..f35f4f9d628 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.no-redirect.http.html
index 372dc54da90..46e50330aee 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.swap-origin.http.html
index a7c824ad849..7f04abb3832 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.keep-origin.http.html
index a6b479af227..ce045a716f0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.no-redirect.http.html
index adf1a64ee3a..533660ee479 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.swap-origin.http.html
index 8a5191c15d7..4e35fb2b7d4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.keep-origin.http.html
index 3399f87e517..2ffa21d9791 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.no-redirect.http.html
index 7c650385210..74e83f43373 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.swap-origin.http.html
index e5c6ef5c92b..028f7da6a1c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.keep-origin.http.html
index 548db299dc6..bc777fae384 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.no-redirect.http.html
index 966c035869b..9389f18bb6f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.swap-origin.http.html
index c195ca6fbf1..761bffa81c5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
index 373a9d8b424..2950bba1a75 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
index 003e81f97cc..be2e12b89e2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
index c2ac0fa7c58..1d299ff465b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
index 5d3fe70c29f..de6243fed8b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
index ae5b1bccb9e..af4d19e238e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
index 6fc4bf67a6e..6ccc1ebc335 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
index 13a02941aae..1d4a6bec05f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
index 018e4e1e316..8a91acb59b4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
index db653dd595d..d682ec14538 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
index d40e774764d..43b67209f54 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
index 96d38f157ce..8d10af50ad3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
index d03f111c04d..7c06426b42e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.keep-origin.http.html
index 7cb49559443..0e0cd8f4209 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.no-redirect.http.html
index 2761d9697a3..c7e2bafefa2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.swap-origin.http.html
index 2bb50f41cd5..f04548cf899 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.keep-origin.http.html
index 383626d315e..ad29794a1ce 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.no-redirect.http.html
index 5e55b6dbf84..4387d0cf4ac 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.swap-origin.http.html
index f8c89cfd771..545b751f4f8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.keep-origin.http.html
index cf127d3c076..f8a81a8af33 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.no-redirect.http.html
index 06ed034cb30..e0e31503ac5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.swap-origin.http.html
index 5e718a4ff59..02576c22a67 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.keep-origin.http.html
index e7e5b117869..e9f8da0057b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.no-redirect.http.html
index ce595e64c30..47a215cc5b1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.swap-origin.http.html
index 35e1331279f..fef59b46198 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
index 3ad010c5bb8..0b3d4a144e1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
index e0aed40e21e..c1bab0c9f87 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
index 6d1b9cd64b1..4ae3a00e431 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
index a9d89ec6e67..4f178a66e43 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
index 1a8fb14d32c..e3e0887b888 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
index fd4e3130362..be2eea323dc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
index 7a0cf117762..4f9345f3ea0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
index a9d77675af7..e162101d56d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
index 6b1232ea83a..05e47dc0f99 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
index 24907de0ddd..c7a0e1d8368 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
index f378b6a78b9..04e3160a659 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
index a2b9830828c..d9734ad707a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.keep-origin.http.html
index 094228a3afd..6c810a7a7e0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.no-redirect.http.html
index 5f9428c18c7..6aec28f4d0d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.swap-origin.http.html
index 26bc34564da..973d27c7e86 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.keep-origin.http.html
index 70733ab2c0d..a58c210d4b4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.no-redirect.http.html
index 23913adba9b..45be6a1c245 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.swap-origin.http.html
index 0ea5027139c..0058103f504 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.keep-origin.http.html
index 9fdd68c95bf..fa51fba2bca 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.no-redirect.http.html
index 568614792d4..e863e5bd5de 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.swap-origin.http.html
index f40179f1141..5b24542ef69 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.keep-origin.http.html
index 1d5e7900eff..0ddf2ba683a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.no-redirect.http.html
index 8e7a1f533c5..cad81813e79 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.swap-origin.http.html
index ed7b1d9509e..0eb837ec08b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.keep-origin.http.html
index 5c14128c986..882e2bdb30c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.no-redirect.http.html
index 3b7701e5177..0bd6e26710c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.swap-origin.http.html
index e246c04f341..f14573ac4f1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.keep-origin.http.html
index 4cded5e75da..2685033ec3a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.no-redirect.http.html
index ed777705150..566c7707e10 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.swap-origin.http.html
index 561c181557a..05a331609f2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.keep-origin.http.html
index 146db70d656..4dd3fbacf58 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.no-redirect.http.html
index 3873d734875..d0e4063153c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.swap-origin.http.html
index 35ee0075ae6..7b9571af516 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-https.swap-origin.http.html
index 91ba1db6493..a8919e6e6d6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
index f78530b9716..bed8df8fa8d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
index 9a1732e53a1..279a75d9c86 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
index 74bbb2a1623..017ef55cfd0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
index 0f535518d65..648b3a34085 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
index 15c3bbd4d63..e06fcf8dd3d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
index be4657ff223..1573879b700 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
index 294746ee0d3..8de91521293 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
index dbaab80be69..a912f8c3353 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
index 9eb466a64bc..9343c0f844e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
index 9394b8586ed..804b2d319f0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
index 1c7639d2bc6..3f2d5c87e6b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
index 0a88d3fddac..867558acb76 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.keep-origin.http.html
index 37ac098b52c..ab1bb44662b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.no-redirect.http.html
index baa6526c618..154fcdcdc9e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.swap-origin.http.html
index 94775ea99e5..d24f9f72ba5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.keep-origin.http.html
index a3b8554b4cf..e69575707d3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.no-redirect.http.html
index 084f3dc1574..a97ff758e1b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.swap-origin.http.html
index aa7eab66ffe..f0998db7eca 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.keep-origin.http.html
index 8e17a98987e..98761398f61 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.no-redirect.http.html
index 28878e2b1c2..2e9ac8c3e49 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.swap-origin.http.html
index 40e8f64bf2d..16b2fc085f5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.keep-origin.http.html
index b8f40d6493b..098365ba4d2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.no-redirect.http.html
index d287d5e4731..2941add0f67 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.swap-origin.http.html
index aeb97eb8809..b6b4cbc6d8b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html
index f06f701b30a..3ad3d020d7f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html
index e0d56f42938..fe66f6614d4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html
index 9cf8b085f8d..e3f2f3bd1c9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html
index c6536bde928..3528e78c77c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html
index d43e6a2cc4b..a45b53d2228 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html
index 06fbbb9e1fe..b6789f90c1c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.keep-origin.http.html
index bb76971c646..d1105d22cd8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.no-redirect.http.html
index f28611bd39f..a3b470858f4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.swap-origin.http.html
index c52383aff71..4fa99cad125 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.keep-origin.http.html
index ebcfe405b0e..d5498791301 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.no-redirect.http.html
index 9f7d448282b..e06f10ff2b2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.swap-origin.http.html
index 208c7a7a139..a412e4c220c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.keep-origin.http.html
index 6f7a990c362..f35f4f9d628 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.no-redirect.http.html
index 372dc54da90..46e50330aee 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.swap-origin.http.html
index a7c824ad849..7f04abb3832 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.keep-origin.http.html
index a6b479af227..ce045a716f0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.no-redirect.http.html
index adf1a64ee3a..533660ee479 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.swap-origin.http.html
index 8a5191c15d7..4e35fb2b7d4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.keep-origin.http.html
index 3399f87e517..2ffa21d9791 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.no-redirect.http.html
index 7c650385210..74e83f43373 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.swap-origin.http.html
index e5c6ef5c92b..028f7da6a1c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.keep-origin.http.html
index 548db299dc6..bc777fae384 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.no-redirect.http.html
index 966c035869b..9389f18bb6f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.swap-origin.http.html
index c195ca6fbf1..761bffa81c5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
index 37f6fd2a404..2d7e93c906b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
index 2942f9ccf54..016ffb87b5f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
index a3659cfe9ff..18766cc98a9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
index 6583977d468..862c7297d51 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
index 780138004f9..9413546b07d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
index b914ad4d739..5661283ef0b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
index d2f057da025..c2b0cab8a17 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
index fa5f521e4bd..67a7cf11cd9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
index ed1728d5e29..435d78e20d2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
index 98105d7714a..e945b6bdb6e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
index 20f880acc54..9c5116465be 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
index a454f59feab..d8d0e2642db 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.keep-origin.http.html
index 09d2082111a..0e867173f6a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.no-redirect.http.html
index 508eddd0980..32babc6af8d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.swap-origin.http.html
index 326e2dfee70..ee52a7773e3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.keep-origin.http.html
index 876cc6eb2ca..93e73e77a78 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.no-redirect.http.html
index 5969cab93a0..d67c6fcf20f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.swap-origin.http.html
index b3f753b4c33..0f1f958b931 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.keep-origin.http.html
index 2292457180d..ad9edec08d6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.no-redirect.http.html
index 79f359fd826..337521b5995 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.swap-origin.http.html
index cf564845460..98d39e522de 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.keep-origin.http.html
index de2adb477b7..6ba35c7fc32 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.no-redirect.http.html
index bbfcbd3d48e..f9b850b9237 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.swap-origin.http.html
index 7e7bc200369..bc62feeae0f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
index 3c340cb6ddd..5d061f4fd38 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
index 4d9c9ad4e2b..ceada990e70 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
index 65828ddbe43..ed500f68b73 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
index 205e957b447..4d73ccc7111 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
index 11360c83964..fcde2e4b561 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
index 11a17fa1a5d..2a97d907933 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
index 67c954be9eb..bfb05f04fe5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
index ea8a89bb387..5bd8cdf1e89 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
index 084d24a38ce..6624377f8ad 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
index 1e8247776b0..41d8e411e71 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
index bd29bf94c24..820c6a30064 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
index 58240b9faed..0114621aa7c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.keep-origin.http.html
index fdcec2041e4..c6b74361d5a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.no-redirect.http.html
index c436821e3b0..ae5804351b0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.swap-origin.http.html
index 15d16ec7993..33c96640cfa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.keep-origin.http.html
index b5aa883d3fe..0316addebf6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.no-redirect.http.html
index c823f712f95..5521177869c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.swap-origin.http.html
index 7bc80256b52..e77bb3b0cf1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.keep-origin.http.html
index ba251eb6af5..fdcc1c93a8a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.no-redirect.http.html
index 5790465c573..70bd6bebce5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.swap-origin.http.html
index b1834ef253d..a94dc36b057 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.keep-origin.http.html
index 6b942390a10..2810f988579 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.no-redirect.http.html
index 9798816924a..6a18555b9a2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.swap-origin.http.html
index 56f71d7a497..812ce1d19e7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.keep-origin.http.html
index 3da9967a951..e18fcc77d55 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.no-redirect.http.html
index c17b37bc438..63ad650a18e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.swap-origin.http.html
index cc3fee68658..0bc77a7bb82 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.keep-origin.http.html
index ea91c863fb9..f7131c53137 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.no-redirect.http.html
index 71a1ec3646e..83a1cf8aab4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.swap-origin.http.html
index 737fda730ff..ced54f76ff4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.keep-origin.http.html
index 5a62982a6eb..68aa52ad260 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.no-redirect.http.html
index e3b14f52ca0..e831c0effcb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.swap-origin.http.html
index effeb0a9a88..0f74309a16a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-https.swap-origin.http.html
index 4a1aee99c98..6687a674b7a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
index a817b0fff97..1c0425ce109 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
index 03ca6e5c4c2..ff10415547b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
index 54756e4e50e..206cd9c2510 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
index 2496ca3d601..493de2bcedd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
index 665229e526b..6489ded73f4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
index cd3818dfc3a..3a661a3f495 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
index ed018a7e87e..f85f0ba58e6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
index 2429d19198d..cfcbc8efce1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
index 3c6c42b904b..45f9cfbc85d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
index df259116fda..20b1362308b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
index c0ae8b64bd0..99b9c46bce9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
index 3a4a73da09b..26d31e7d02e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.keep-origin.http.html
index 65d4d275b11..b898c979e96 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.no-redirect.http.html
index 5b2e032f1cd..0f93a0d381d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.swap-origin.http.html
index 5aaf2f75b78..5cd7090cf90 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.keep-origin.http.html
index 27058b1fb62..c1673ccd931 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.no-redirect.http.html
index 6eb54403f3c..c7ef7f1ec78 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.swap-origin.http.html
index d23a00666e7..b67bf41743f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.keep-origin.http.html
index cbd4999e402..c3f6792d6a4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.no-redirect.http.html
index 271183fcb4e..491f6b3cb52 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.swap-origin.http.html
index ac2723008ce..df34928f993 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.keep-origin.http.html
index a388de9a4ca..8bed4ad1bb2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.no-redirect.http.html
index ba5cba7294d..f3d1691d6c1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.swap-origin.http.html
index 61c17e05527..53833472352 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html
index 42ad5ee0a38..949ed772ff5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html
index 30af7d2f956..8782ec3a348 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html
index ceb66ae165c..42971f47477 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html
index b9ac57bd605..86ace00858d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html
index 94b29642faa..c719ed4e40e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html
index 9ae52af1918..95d876e75c5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.keep-origin.http.html
index 80d2ef3d637..64f671f5b52 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.no-redirect.http.html
index 54b16bd2f2e..154a3be99a4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.swap-origin.http.html
index d1a1d0f94f1..5c0c6039643 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.keep-origin.http.html
index 4c39915851c..b9b13627877 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.no-redirect.http.html
index a577b04536d..c346912a145 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.swap-origin.http.html
index cae58dc0583..e634871612c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html
index 18f5f7e7836..6c9682c6b24 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html
index 7608b8dd81d..979a6c859db 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html
index e61405026d5..55d837ef0f0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html
index 227bfb014ab..53b50b0efb4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html
index b103557d52f..ade9ba3304c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html
index 1945521974f..c37a4614ef5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html
index 794a5d82dc5..7935c4c0c88 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html
index 5c04b74bfdb..ed7e92b3c52 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html
index 2d6e05388ec..495d9569e73 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html
index 8374abffd93..bde07eb0c93 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html
index faafb375930..71e1b673a58 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html
index 00cd1c9a4c7..d2222b6feaf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html
index 34abf8e3166..30af1009de8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html
index 540695000e9..fa8f2ae0ccc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html
index 91017dac64e..d3dcfababd6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html
index 69934afdbe5..ed11cb5b040 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html
index bc51d55ed10..6db93695c79 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html
index 6ae3dfe0df2..4e77af21371 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html
index 310a25c9d7a..8cbbf1cfc7e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html
index c6e652dbfb8..eb3623f74b1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html
index 13002bc2f2b..b812f085f0e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html
index 0333192ce9e..9c5133009af 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html
index 411bd2378ad..f74bbac811d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html
index ab458a3fdc0..86b2560b7d6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html
index 3d7a405eeb1..c788359120f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html
index 439e0ad2f3a..ff16c2bbc22 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html
index d3a5b39ca80..15fb9b2a4d6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html
index 01ea8d525a3..c10fff1aac4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
index f1726338251..71ab849c76b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
index 9c2ba561f69..ddf34a6b7bb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
index 681e67532c2..2b143328b4b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
index 399bb9ea0fc..2bfbc263018 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
index 65826f7c85d..aa96e23a25d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
index 73efdb75332..bce09ce6866 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
index 761a7e349ea..fe82a2f859a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
index 55309a1d31e..527f27da5c5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
index 228985630e4..2af8f5538f8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
index d87b9ac71a6..f18c37f4d43 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
index be33a5498be..c92703d274f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
index 52750a374b1..51464011540 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html
index 643a7809abe..bfbb2ff96fc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html
index b8c3ca8405c..460116ebce9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html
index f9c6b33cdb8..4ebfa352e04 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html
index 1d2de6d2a13..4f9b358e394 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html
index 31328d45740..f0ac944aceb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html
index 717cd564712..556ccd4c236 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html
index 93aeb304aa0..103678ca070 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html
index 32dcbabd956..3e68258c56b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html
index 9c0f9300cb4..b2382583a1c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html
index d0d99bf8db5..b0d57326991 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html
index 489607530db..5bffedaa3af 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html
index 8d7c2e4e116..9df184c35f8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html
index 0947e01737a..17d44359222 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html
index 0f27e978db8..1138d88ebd2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html
index 88217e8b3f0..a6f8057809d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html
index 4371c15add6..9f523e3123a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html
index bcd98e69823..4c831d17355 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html
index 200d64bbb6b..0778be7183a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html
index a83a492fdf7..30eaf1a707d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html
index 55a05502590..b7a5de235c5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html
index d07af49677e..1ce5a65db10 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html
index bb681309a81..0022023089d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html
index f493ba675f0..6cd8c6738e9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html
index c0c3284332a..504db6741b3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html
index 8b1519a47b3..f8ba7575e2b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html
index 7fc6be9d0a7..9d01a07ef34 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html
index d00ccc947a3..6d36dc316f4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html
index 285b3eab42e..950a580fe73 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html
index d6f5fd26091..2e9ede068bc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html
index e7d9c7685cb..7eaf8ce04d2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/cross-http.no-redirect.http.html
index 3c3e39e7971..1e9ee507e11 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/cross-https.no-redirect.http.html
index 20a4881d258..4a06e8400b8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/same-http.no-redirect.http.html
index c45b1f4c7a3..6b04a7e8cad 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/same-https.no-redirect.http.html
index 0a34f109e15..6e8c27b09fa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.keep-origin.http.html
index 1662580623a..16d2d07132c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.no-redirect.http.html
index b05452f5f5a..eb37f132636 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.swap-origin.http.html
index cfd7990f1f5..94bdab2ab22 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.keep-origin.http.html
index fa89fe78b68..9693fbad391 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.no-redirect.http.html
index 8d5e2b0776a..70665d2bb08 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.swap-origin.http.html
index cf2e2054acd..e932d32a89d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.keep-origin.http.html
index 59ec4797c2e..97f68e0858a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.no-redirect.http.html
index f883d367e7f..4524c2db385 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.swap-origin.http.html
index fa64998f81f..1e685b22931 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.keep-origin.http.html
index 5eb42a75a5c..41a1ac31786 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.no-redirect.http.html
index 80c44e16cd5..7358d86b643 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.swap-origin.http.html
index 8bf62ba6310..7e1c06d3b12 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.keep-origin.http.html
index a11fb430927..0d40b8c7741 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.no-redirect.http.html
index 4ed4f0ed555..99176391e20 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.swap-origin.http.html
index 66270486980..3b2746d4c35 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.keep-origin.http.html
index 0e1f69de7d8..059a2d67565 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.no-redirect.http.html
index 1d4a266b900..d43ae0a4ea7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.swap-origin.http.html
index 37af269c833..9692f56e25c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.keep-origin.http.html
index ee600f00764..c2e55e279c1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.no-redirect.http.html
index c1444081844..78774cff2b9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.swap-origin.http.html
index 78d874cd7b4..08b0ac93aea 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.keep-origin.http.html
index 05d58994cdb..cb32702f784 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.no-redirect.http.html
index 180b42ddf55..2838cd9bcd0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.swap-origin.http.html
index 8efb1f5871b..354dd98840e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html
index 112b9268f43..18bad3a68da 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html
index de4676d67cd..89260d61d10 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html
index 4ee121ff97c..67abaa5dff9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html
index 025968b66e3..ffd380ac39c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html
index 54a0de2c93b..df378f645f6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html
index b155363e058..5b6b84d9100 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html
index 7fea42178ce..244d330474d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html
index 2401b8f330b..56a2eb97e0f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html
index fa53b0b436a..85bdbc7409a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html
index ec819af6931..8e0f8da2394 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html
index 4aceaac58f9..3107f0de8a7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html
index cd8fbfe9098..f106363aa73 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.keep-origin.http.html
index 68f9e48740e..be1caba6b6d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.no-redirect.http.html
index e50c977d248..7a0acfad933 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.swap-origin.http.html
index fb2648dd4b7..3493b25ccc1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.keep-origin.http.html
index 18eb49cfbb0..631371477fe 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.no-redirect.http.html
index a0843338a23..8a09a0a99e2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.swap-origin.http.html
index 346a5e64f1f..62dc281f9e7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.keep-origin.http.html
index bd3d2fa8e1b..76fea046178 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.no-redirect.http.html
index 9ba37767951..bc909a690d1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.swap-origin.http.html
index 1c874e8f249..fd9d14b3c77 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.keep-origin.http.html
index baef78cb21e..abc4c33ec5a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.no-redirect.http.html
index 51c81ff6fa0..7fd5d2a88fe 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.swap-origin.http.html
index f2c03ebcd99..15c9a665d71 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.keep-origin.http.html
index f1a249f2438..ddb27f9b197 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.no-redirect.http.html
index 1f836c6f2c0..f85e49053ad 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.keep-origin.http.html
index 1158bc7e5e5..95b183366ae 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.no-redirect.http.html
index de67fa3aa8b..6f7bcbfafb9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.keep-origin.http.html
index b6656c669a7..143c9fc5111 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.no-redirect.http.html
index 552e926e44c..ba4d39931d7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.keep-origin.http.html
index c77a423b3cb..086414ccc48 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.no-redirect.http.html
index 3cf0e572297..5d7ad100bcd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.swap-origin.http.html
index 7a82b1abf34..30f2b3953d7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.keep-origin.http.html
index 41170c6e4ae..47b798d7dd7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.no-redirect.http.html
index 220ff817094..d5a55105add 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.swap-origin.http.html
index 3ea97ac3502..176dc4852f7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.keep-origin.http.html
index 28f38a4a700..3f51d82edde 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.no-redirect.http.html
index 6e8631db120..95684dd2547 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.swap-origin.http.html
index af6dc67f3ff..b1de49c4c06 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.keep-origin.http.html
index 51a52d09cd1..9228bb6af2d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.no-redirect.http.html
index 6bf08797e01..96bc099560d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.swap-origin.http.html
index 1f0626a09d9..f25d5fb9af0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html
index e332d57ae86..fab257dd738 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html
index 790d5f73714..bafedcf3fd6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html
index dd506fcc066..d8ef3354aef 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html
index 7b5468e47bd..0c25521be74 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html
index c58cb7c4b54..c6dea13384d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html
index 3d5df31d943..9be5c2e15a3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html
index e694f13dfe0..4f797b6d4be 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html
index 0cbc3be83a2..245b5ecf860 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html
index 12b6a96104c..ff54b29fe69 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html
index e528b97d5f1..1eb441d07eb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.keep-origin.http.html
index 350d7cf796a..010d99253f7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.no-redirect.http.html
index 850a8e81232..cada33d19f4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.swap-origin.http.html
index d222bd295df..8a8151fbc2c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.keep-origin.http.html
index 694a57d412e..fab78eb6062 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.no-redirect.http.html
index 459cf30238e..43e3a207983 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.swap-origin.http.html
index 1e951faba7b..febb2ba2199 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html
index 8ef8fd6b894..9de1045c62e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html
index aa355566bb6..dd9a07848a0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html
index 4d789df9d53..19122f3b194 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html
index acecfefe3b2..79c31cf3a76 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html
index ecef33210a6..48d694afec1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html
index 1de14dd530c..b163b434fc9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html
index 5f94bbb6d18..f668a45533f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html
index 6863810352d..0b2179a805b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html
index cb5e36377bf..b63b06151ea 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html
index e8a9ab43f19..c14a9627308 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html
index 9f9813e75f8..0dcd4ceecf3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html
index f4a8058f8d4..39eb627d300 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
index 088b203f084..743cc6aa099 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
index c79f0b3be2a..cb35a2155ea 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
index d4e54c08a3b..5a4e050859d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
index ac4ca124bfd..9bb8ac57735 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
index 66ab573165e..62fc2a062b2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
index 40d68fc5eab..35d0445ac46 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
index f3a0351f660..37be3a3d4de 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
index 8432eab8ff8..f6f53d3632a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
index b5a678d0e02..6ed394c67d8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
index 23558d8e061..0f49938792d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
index 08b627f56ef..b0738fa17b6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
index cc5e6a344c6..45e55fa37cd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html
index 11581aacc0b..3f318e0fd05 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html
index 0aaf48c1010..5bfaa6cb7ad 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html
index 9682cc4cb25..11e17a1e839 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html
index 6362258b77a..b1edae5abaa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html
index 317f9dc8998..b154facf1b3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html
index 7e5114e8106..f58ee4d2533 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html
index 550b2c10d57..f0b296a1ba1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html
index abb407fb705..eb15862751b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html
index dd4e877d1bc..bd2d53ccb72 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html
index 4436f05931a..436e29bcb9e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html
index fba6c926d97..0bafa850704 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html
index 0350fd66e6c..976bd16af58 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html
index 03abe36f369..81442203b00 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html
index f220d76ba5a..a48bb8bb008 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html
index a97293eb16b..45589e04506 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html
index 256343a4102..46b0761c37b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html
index 89da503edff..4263c9ca372 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html
index 566f78b287e..37aa91a2cc9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html
index 64d7baa1f1a..913aa0564a2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html
index 1e087a18106..b33622d6fe8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html
index 07d84ff367c..dbd1d6033fb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html
index 55c2083a1ff..4e785bd9491 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html
index e0792a252e0..7cee1eef457 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html
index 3c2d87578dd..17ca3b0d905 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.keep-origin.http.html
index bea5b349e2d..0dc78e46207 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.no-redirect.http.html
index a90fdc68ded..6646c6fc66b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.swap-origin.http.html
index 38040fe3495..5509539c492 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.keep-origin.http.html
index f0e9a7f1fb1..b2eac1b7ca6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.no-redirect.http.html
index e5429b6e783..60d0079467a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.swap-origin.http.html
index 2fbb1450199..d35863d9f26 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag/cross-http.no-redirect.http.html
index 40aabbdfbea..99ae09e0217 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag/cross-https.no-redirect.http.html
index 3ca4033c4f5..766f4b0d7fa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag/same-http.no-redirect.http.html
index 9bffefa6f50..3e6668aa68c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag/same-https.no-redirect.http.html
index 2174421cf70..5a43002170a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.keep-origin.http.html
index 4f6f519fb35..0c32a50951b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.no-redirect.http.html
index 34a0c86b978..8c308f39300 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.swap-origin.http.html
index 9e8df6a1d89..ce2759ce911 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.keep-origin.http.html
index e36c3b5d247..36adf76da5b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.no-redirect.http.html
index 2e0052a4ea0..5acbeceff05 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.swap-origin.http.html
index 58bc8bd6c84..69a33269899 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.keep-origin.http.html
index 27dd44cc172..7f8590b55c4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.no-redirect.http.html
index f6b77d4d149..3c664a3c68b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.swap-origin.http.html
index 9c1f0e0cfd9..e0b6d2a7d94 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.keep-origin.http.html
index 51d5c12f110..f6ba0d1be63 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.no-redirect.http.html
index c79ae742878..ba22bcd31a1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.swap-origin.http.html
index b36071d3e11..448160faccf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.keep-origin.http.html
index 4f7bd2ddb7c..2d0778fd919 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.no-redirect.http.html
index a4dae22bfb9..f19cca83cfe 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.swap-origin.http.html
index 7818554992a..3d049834cac 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.keep-origin.http.html
index f1fe7c006f1..81c10f2dd9a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.no-redirect.http.html
index 933c6729d4a..338a487d7d7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.swap-origin.http.html
index d315738e0e7..5c0951d525a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.keep-origin.http.html
index 178968e6db3..0b599bea5b7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.no-redirect.http.html
index 65213cf1074..32d73c1743c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.swap-origin.http.html
index ca9c9df1ef8..d41f8f6eed1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.keep-origin.http.html
index 9636530141f..99f63208e48 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.no-redirect.http.html
index 3d04897f9b2..69305a0b484 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.swap-origin.http.html
index 1a3508e9a1f..eef425d5ffd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.keep-origin.http.html
index 6670d6d8a41..97bb25aef5b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.no-redirect.http.html
index c25a33644e9..2e11e4486f9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.swap-origin.http.html
index 3d7ad2168dc..60775ba765d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.keep-origin.http.html
index a11fa5d93fd..ac8d8a9ad2d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.no-redirect.http.html
index 11a545f1e79..f7ecbdc6e3d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.swap-origin.http.html
index 21c6d95057e..ca99ee00c2b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.keep-origin.http.html
index ff1ab459def..39f770cec8c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.no-redirect.http.html
index 1b6646dacb9..67a83a860dd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.swap-origin.http.html
index 0d17830d020..db5f2e1f973 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.keep-origin.http.html
index 3a05e06ed0d..12c2f63db13 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.no-redirect.http.html
index c33af79980a..577f687c9cd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.swap-origin.http.html
index 92344ccb466..df9ceec26bf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.keep-origin.http.html
index 8351133d2e1..22da8eed11b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.no-redirect.http.html
index 945f2bb4617..29c997ce789 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.swap-origin.http.html
index bf97f96ea5b..686d752e0e2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.keep-origin.http.html
index 26c541a27fd..19b2b3cde20 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.no-redirect.http.html
index a78bdd5a909..9c29b03778f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.swap-origin.http.html
index 050da344555..834b8f3b4c3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.keep-origin.http.html
index 829caf653a8..2a5d372f135 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.no-redirect.http.html
index ab8aabba902..ad482734571 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.swap-origin.http.html
index 2d6ba47b75a..0b95cd122b3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.keep-origin.http.html
index af54beeacab..9402a90b4fc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.no-redirect.http.html
index 3d7ed51d9ff..12d7fa65b5d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.swap-origin.http.html
index 8c2c4493452..483a21bb49d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.keep-origin.http.html
index 8b26ae4b565..9bb9edc5dde 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.no-redirect.http.html
index 2e11e130dfc..d4c469d0cf3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.keep-origin.http.html
index 7e2272825d6..f209c5c1416 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.no-redirect.http.html
index 382e1862566..dd362554e06 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-module/same-http.keep-origin.http.html
index 8179b7a1e41..7d8d98b8e97 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-module/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-module/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-module/same-http.no-redirect.http.html
index 51f2f9e709f..1d6c72b408a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-module/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-module/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.keep-origin.http.html
index a41d69ad7b2..e6d8e3adf1e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.no-redirect.http.html
index 456f0bf7025..8699a38d26d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.swap-origin.http.html
index 0081e74065b..32318f63888 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.keep-origin.http.html
index 7abd36b9518..ee0d6ef999d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.no-redirect.http.html
index 0394d16ece2..ab5bbcd25b7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.swap-origin.http.html
index 315b1af6c72..6cb441f026f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.keep-origin.http.html
index 227aec5a81d..5bfdc033c77 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.no-redirect.http.html
index a1f6d307ead..32e1ffa0a5f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.swap-origin.http.html
index 17528695279..ac57d090c72 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.keep-origin.http.html
index 45ad932c87c..9465c026fe0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.no-redirect.http.html
index 24b16af2b5e..7e57d479231 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.swap-origin.http.html
index a2c0e8ae444..e1bbbc32e8a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/a-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/a-tag/cross-http.no-redirect.http.html
index 2b9d2097e37..3cc76c77ed8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/a-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/a-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/a-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/a-tag/cross-https.no-redirect.http.html
index f47e6918ffc..129f9649b38 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/a-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/a-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/a-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/a-tag/same-http.no-redirect.http.html
index 13f42bcf980..beaf04faae1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/a-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/a-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.keep-origin.http.html
index 8f34e4b40b3..2940080f25f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.no-redirect.http.html
index 1508e7b65d2..f7ae2c15f63 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.swap-origin.http.html
index 7aee58850d6..39087e48490 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.keep-origin.http.html
index 3fb3fc860c4..f33ff335dc9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.no-redirect.http.html
index fce68ea7cd6..ddaebd57992 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.swap-origin.http.html
index ce29d475272..d594aaf6064 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.keep-origin.http.html
index b08ea62152b..13b32f75254 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.no-redirect.http.html
index c3228e68db7..d7938aa553c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.swap-origin.http.html
index 959da6b41ff..db62a2b1dbe 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-https.swap-origin.http.html
index 7d4cd7464ff..01849606f0b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.keep-origin.http.html
index 21f8c3133c6..d5dc8ad754d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.no-redirect.http.html
index 9280b146790..bb2006273a6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.swap-origin.http.html
index de7dd9fc27e..76df663efcf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.keep-origin.http.html
index 3fe94d95d01..0b0d49bb2b2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.no-redirect.http.html
index 147691d1211..aecdddae47e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.swap-origin.http.html
index 10f02d38b7c..c591a8b6078 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.keep-origin.http.html
index 839a460e2f3..002f1b0b1fd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.no-redirect.http.html
index 6adde4099e3..a11ea0016d8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.swap-origin.http.html
index 18b9318f0ae..42d5b63bddf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-https.swap-origin.http.html
index 99754a15bc4..054ef8e1c8a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html
index 7d76b2d01f6..757c6cf5a1c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html
index 6f3f81efed2..7656846845d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html
index 07644228697..487d0a624e3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html
index c99b805ee6f..3276d4a996a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html
index abd5da87073..f6fb89af57e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html
index de3f34e6ed6..680dcfd4bd9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.keep-origin.http.html
index 02890f01339..5c84aae4866 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.no-redirect.http.html
index d53b6b67151..717507f9265 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.swap-origin.http.html
index e7f8f4e1ce8..919c0f8a5a1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-https.swap-origin.http.html
index 323971aceff..af9925a8451 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.keep-origin.http.html
index 9339fe1536d..c7143f68422 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.no-redirect.http.html
index eb440bf0e39..961cb3aeb38 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.swap-origin.http.html
index c86ad7a9c52..3db83295216 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.keep-origin.http.html
index f61132e7684..139b04add45 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.no-redirect.http.html
index b62e58c7963..ec0e8df1403 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.swap-origin.http.html
index 78b5d49337a..1be2acd3785 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.keep-origin.http.html
index 0aed5b01195..24e5f26ba79 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.no-redirect.http.html
index 7a6f1a2788f..1a990220ec3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.swap-origin.http.html
index 433b905fd36..7a361b75147 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-https.swap-origin.http.html
index a18912fb172..188c8b0e5de 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.keep-origin.http.html
index 8528aa86433..9f4a1d47f2f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.no-redirect.http.html
index f2e87c9c86e..166160a96ed 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.keep-origin.http.html
index 4478b057eac..5ee8e5e26f3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.no-redirect.http.html
index 971c35f3f17..22f2b90fbc4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.keep-origin.http.html
index 4646ac18bcc..19792dccaea 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.no-redirect.http.html
index 34380c9974f..372ef3032a2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.keep-origin.http.html
index 991590d42e1..90701196514 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.no-redirect.http.html
index d1c5e7679d5..54a7216fe5f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.swap-origin.http.html
index 4d59243b94a..1562379d9c5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.keep-origin.http.html
index 9fe84a6563e..c8d6c8ce57d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.no-redirect.http.html
index 68c24674791..7e2fe401a09 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.swap-origin.http.html
index cde13783182..8d658e01fd3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.keep-origin.http.html
index 02b2b05ea96..13927c018f8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.no-redirect.http.html
index b82f10fac5d..08592522be3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.swap-origin.http.html
index 0a691b51adf..00fa8971d93 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-https.swap-origin.http.html
index 84c5c47a5bd..effafc05137 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html
index 381a8d7d279..3fb51410b87 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html
index ce747104182..5b16684bb75 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html
index bed1549ef06..981e166ba35 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html
index b4a8996e8d1..50c149fcd20 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html
index 7ff567aac41..8a7503fc8cb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html
index 1d8baf9638b..038e24dc669 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html
index 0b9637e29e0..e241e786f22 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html
index 8356d022948..5dbdb557500 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html
index 7549a656c6f..4cb9828923f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html
index f9b940e0324..a0b52e56449 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html
index dd7a2472099..5e4a8449dc8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html
index cba214803a5..578307ac340 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html
index 8d4768f30dc..0c41cffd697 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html
index 242469e626a..43dbd10f9c4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html
index e2daede730a..99c62812041 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html
index 247684e333c..23007609156 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html
index d5ef4e6e93a..ca13e727f78 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html
index 5587203648c..a967ca30e5c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html
index 9bed03a541a..28ed9945efb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html
index 9b114b16f40..7ac86c29b27 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html
index 2637b57bcd6..6d128801950 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html
index 6241294c212..179cee2b8bf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html
index 654680d7d1e..e4a15f4b7fe 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html
index fed512ecdd5..8b73fc151cd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html
index f97f14d41b2..60f4191fd1c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html
index 56b9f6f86c3..30d946e1120 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html
index aa9c6ffd19f..32f072019bc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html
index d995d234607..24de41cbfc0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
index 6486b9dde2c..31c651b098e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
index 1c49b3520d2..3e6139f6a58 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
index 2bc4da51dc6..8323b499ca0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
index 5e25e169f78..761bf9bf47d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
index 81df37d3e4b..9662bb3e45f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
index f6f52aa85ba..985607ffeec 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
index bf41468931a..8da5c17bc15 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
index b5f5ef832f2..28d81ef1b2a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
index fa1d2283dc5..95064a3451d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
index f642c322c9d..984f4b01d98 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
index 073589c421d..0e240a08b50 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
index 67d55d83c84..69793c232a4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html
index 74767b3ea5b..aa7bd079fe5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html
index e4926582f1d..413a2284bdb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html
index 2f9c2e45d98..3a7483358ab 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html
index 19f399b9736..5bb16577d04 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html
index ae82747b73f..0bb50cc658b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html
index 2435daa311b..23642733b3f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html
index 3cc3cd8d662..b82f84d479a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html
index e75fd6e7f0c..b8f547403d0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html
index 0883f6a00cb..27144b99999 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html
index 7d383a87180..53e42b69cd6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html
index d6b62169c06..c0de49f4b99 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html
index 2d909b007f9..d27684e3c39 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html
index 9d4f18241d6..b22bc8e75f8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html
index c55a1555bc6..9f2bf170022 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html
index 2f77e61e1a8..c7382dc23f7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html
index ce7579e4c53..1f6a02c479b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html
index 5cc19088d8d..1ee00d1596f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html
index 9b27acf1dac..fe2898b64df 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html
index db2434cdb40..95b74be4ea0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html
index 8f7e4439029..69cd183fb2e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html
index 1bd2cd5c09b..a6eee7dda35 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html
index f96b0bad318..3259c33ffc3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html
index f69f34751f4..7f18003e95b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html
index 4d98307f233..03839b5e079 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html
index 0faa04f3ae9..b0e632dd555 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html
index 71d259aa249..e87ee71d406 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html
index 229e4d81a1b..c65e7c32f51 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html
index aa80aca528c..e3e18f2a866 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html
index fd083ee93d2..223003fbede 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html
index ae41601a66c..9490773aef4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-http.no-redirect.http.html
index d8400eb77c5..17391c8a0a6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-https.no-redirect.http.html
index 2df96ccb120..10981850060 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-http.no-redirect.http.html
index 5ff2faa3b08..13197b62386 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-https.no-redirect.http.html
index 882629433fb..a1a501f6e86 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.keep-origin.http.html
index 26755b1d5d0..2353cee1530 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.no-redirect.http.html
index 762b2a37d72..dc1667cbc10 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.swap-origin.http.html
index 06bec6dfa65..c8448c546d8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.keep-origin.http.html
index b9066e8025a..de81ab0da86 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.no-redirect.http.html
index e1f40610e19..6cdaa16dff7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.swap-origin.http.html
index b9efba712ef..5f9b73e1fc4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.keep-origin.http.html
index d70c493fb20..b1ffa0b358c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.no-redirect.http.html
index 07167183a67..00640885a6d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.swap-origin.http.html
index 7e4592afb2f..0dc59c13e9e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.keep-origin.http.html
index e17f4011142..a9b58efea81 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.no-redirect.http.html
index c1ba382a6e2..83280ce93fb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.swap-origin.http.html
index ae8e73c219d..27e56b984c5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.keep-origin.http.html
index cc41d608efc..d1e79b04b14 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.no-redirect.http.html
index 64a356a7e8c..5dbfc539534 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.swap-origin.http.html
index 05ab0900770..85c2ba418db 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.keep-origin.http.html
index 74dfe450431..d85ca1cce45 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.no-redirect.http.html
index 02a1084e290..1b314059670 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.swap-origin.http.html
index 60665b949c7..a317d4139ac 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.keep-origin.http.html
index f520223cf72..5e4d8771720 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.no-redirect.http.html
index 544c58d2fd8..94c21f538b7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.swap-origin.http.html
index fb80a7297ac..18d19be7bde 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.keep-origin.http.html
index 9795a487b6b..2eee2a663cf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.no-redirect.http.html
index abcbee94c3b..ed300073823 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.swap-origin.http.html
index c8102949ede..21144a59790 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html
index 657908de15e..5289d6cad05 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html
index f17fc3a764c..d5c7cb27d19 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html
index 4c8d0e36e70..c98ef613a08 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html
index fced53dff43..a95d09c8870 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html
index b22aea4813a..587c5bab121 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html
index 644c8433081..274764fa2c2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html
index 94a08ebbb5a..70c02b2d16b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html
index 66f91396d96..427458a2e79 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html
index b7fa7c76ea6..8028f64fe45 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html
index e5b32493762..d408826f1f4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html
index 700e6caeafe..b19cd0eedf1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html
index 287f7241a63..bf9c77a8bc9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.keep-origin.http.html
index 265dfdb2939..e92926b38b0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.no-redirect.http.html
index 60a610c883b..74d7ac544f5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.swap-origin.http.html
index 249a08c3792..4bcaf120924 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.keep-origin.http.html
index fea15e881c6..50c9cf56126 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.no-redirect.http.html
index a0197fa9707..db50dc6d111 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.swap-origin.http.html
index 53bd0cc7648..7cfeb5c0093 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.keep-origin.http.html
index be4c36650f3..b549702063c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.no-redirect.http.html
index 50e95a73b13..c0c2fc2af42 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.swap-origin.http.html
index 10d30d1f616..dba717bfa94 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.keep-origin.http.html
index d4c1c0c94a9..c9e87079833 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.no-redirect.http.html
index 0b9510c6377..f6bce1c7424 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.swap-origin.http.html
index 59aa240ed33..ef2ae0cf9d0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.keep-origin.http.html
index 73781b6bcf9..28729ca9916 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.no-redirect.http.html
index 2f5d857e4da..be5637f2fc5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.keep-origin.http.html
index 610a8f4262f..a7b5b0136e7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.no-redirect.http.html
index 1ab66a526ff..695db86364b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.keep-origin.http.html
index b3f8bff7195..406ac90830d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.no-redirect.http.html
index abf8e77cf4d..b88f3397fd2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.keep-origin.http.html
index ad937bcc0c2..e40bd4e342c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.no-redirect.http.html
index 8c6721e53e4..c49c3dc09cb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.swap-origin.http.html
index e8564ee685d..2b7fb9ffc12 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.keep-origin.http.html
index b3b580d9ea7..8f72f1cffe3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.no-redirect.http.html
index 53ef86a4485..ffe36051bda 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.swap-origin.http.html
index d206f41e090..b5d59d53c94 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.keep-origin.http.html
index 38d101103a4..08ebb4a92fd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.no-redirect.http.html
index 39870f731d5..e7871b2914c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.swap-origin.http.html
index 4d7c63bde8c..ce15f91f296 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.keep-origin.http.html
index f6402c403f7..99f3a50e23f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.no-redirect.http.html
index d4171cd2410..7ec67798b21 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.swap-origin.http.html
index 4503188ed02..5aab485f6b0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-http.no-redirect.http.html
index 5c816eb0a44..8bd36a5aa48 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-https.no-redirect.http.html
index 96d4eabbefa..9950fc28b3d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-http.no-redirect.http.html
index 37f12599a1c..ab02dc0a665 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-https.no-redirect.http.html
index 71313a690fa..dd05577ab9d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.keep-origin.http.html
index 83475de46f5..ff238394208 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.no-redirect.http.html
index 4bd1b375963..e42c5761ed7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.swap-origin.http.html
index 832acef5b5f..126f54cb148 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.keep-origin.http.html
index c1a9a94dc12..c09c4733861 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.no-redirect.http.html
index f77455b2703..f7a88fb2c30 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.swap-origin.http.html
index d1060c6544e..4dc3dcd9e4b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.keep-origin.http.html
index e29af406d73..950e6e21965 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.no-redirect.http.html
index bcb14d59021..48ea74171fe 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.swap-origin.http.html
index b7b24f5c106..67cdcec0130 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.keep-origin.http.html
index 81493ee9d36..d909cf5e125 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.no-redirect.http.html
index 6a29be40643..ffec6a01d82 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.swap-origin.http.html
index 87c56c603e6..66b00d6e08c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.keep-origin.http.html
index ccff3d5edac..71149cabafa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.no-redirect.http.html
index 5c34320a6a6..1ec17228f36 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.swap-origin.http.html
index be3ad959509..3df617bfcd7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.keep-origin.http.html
index 4b15fa4a5f4..dc644137b3a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.no-redirect.http.html
index e385c68fabf..79b69cb0755 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.swap-origin.http.html
index 2d1b833a896..4b465a4934a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.keep-origin.http.html
index 1b0b5dfa76e..ed1e4d412af 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.no-redirect.http.html
index 2359faf8082..bb569428037 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.swap-origin.http.html
index 628bf7c9357..f87100f6884 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.keep-origin.http.html
index ff53d09be61..204145629c2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.no-redirect.http.html
index 4e5d310d933..0edb5bcf002 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.swap-origin.http.html
index 8a2aaf9a7f0..91528cb34a9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html
index 13d00be71d2..02d8620cf1a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html
index b391ba07f32..2c3b70e7bdd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html
index f0a3a42cfad..d9c3e50948d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html
index 897a84e2e26..d5cc8bd0309 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html
index 99cad1b4856..4fd10e8950a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html
index 42c2f224d5b..76df80d59b0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html
index 75cb2d163e1..af4a533a048 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html
index 8b37e8fc393..eaccd60742d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html
index f8e6582bddf..13963b209c9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html
index 77b58ce195d..e35988d7840 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html
index 963f8a370a5..9817f039749 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html
index 920b578cdd6..3a1d7e35776 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.keep-origin.http.html
index 26629a29c6d..e397cf3d436 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.no-redirect.http.html
index 98da011b109..8b2ace56b5a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.swap-origin.http.html
index 141f7f55e84..5dfcc70a1a6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.keep-origin.http.html
index b3cd9332d2f..7b2e0b662fb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.no-redirect.http.html
index 09f9c7e1b01..9a235e6cee4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.swap-origin.http.html
index 4cc455c2f5b..5ab8985eb1e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.keep-origin.http.html
index 60519bc6e8b..73b8c926881 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.no-redirect.http.html
index b1a2dde0e7d..3c0ae426bf9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.swap-origin.http.html
index cc741df381a..68142ef041b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.keep-origin.http.html
index 0b825b17e57..c9404817899 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.no-redirect.http.html
index 36a19e73da1..cfdbf2cbf7a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.swap-origin.http.html
index 18013980f38..2ac4853fb91 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html
index 214d4f5a46b..49d26e679fc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html
index 2d86ea85b99..5c0f3f2b5ab 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.keep-origin.http.html
index 16d0292c82f..f9ae9653951 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.no-redirect.http.html
index 6b740f1184d..09fd2f14756 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.keep-origin.http.html
index 0dbd2c92df8..62948a2ebf7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.no-redirect.http.html
index 9de4cbc6dc0..67b2779869a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.keep-origin.http.html
index 603a9aaa5f5..f74607901dc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.no-redirect.http.html
index fc55fed0d04..28080172302 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.swap-origin.http.html
index 412e37f10ff..cdd0e6d3685 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.keep-origin.http.html
index dbd033f7be4..d931133baae 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.no-redirect.http.html
index e69f76eab6c..e1d294af2d0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.swap-origin.http.html
index 36348b46a20..81b2c34a3a3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.keep-origin.http.html
index bab18f65504..7f64858b85a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.no-redirect.http.html
index ad9fa9f1cad..4bcbc0ddbda 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.swap-origin.http.html
index 1be3fa02a7c..895ca00acc0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.keep-origin.http.html
index 6e367a23417..a12c1c9e70b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.no-redirect.http.html
index 0bd6a160c7d..eb85824ac9e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.swap-origin.http.html
index 3aa3f884ef4..0edf4ff90e0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/a-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/a-tag/cross-http.no-redirect.http.html
index 7b76180b128..911f16d5eb0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/a-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/a-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/a-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/a-tag/cross-https.no-redirect.http.html
index ead7efc9633..9d8064ff882 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/a-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/a-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/a-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/a-tag/same-http.no-redirect.http.html
index 0350e03597c..cdaf18c1d25 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/a-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/a-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/a-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/a-tag/same-https.no-redirect.http.html
index be8155abc71..9a6c2b43a8b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/a-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/a-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.keep-origin.http.html
index d6dbf7c38f5..7fa2a77de9e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.no-redirect.http.html
index d6b7b1d4b23..bbf1496d07d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.swap-origin.http.html
index 228bac96566..989c7934ed0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.keep-origin.http.html
index 23a5dc69603..7a596e7f806 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.no-redirect.http.html
index 2b950c4a681..bba5c2a55a7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.swap-origin.http.html
index 68d8dddf59d..867e64067ba 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-http.keep-origin.http.html
index 68a2919245a..5e004ab5892 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-http.no-redirect.http.html
index 9786e115f45..94176020e86 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-http.swap-origin.http.html
index aeb97a12712..82b9de5fff3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-https.keep-origin.http.html
index 27bf0fb3825..20be1f2f656 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-https.no-redirect.http.html
index f2de2eeabfa..244623b424c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-https.swap-origin.http.html
index 2f059b49d6c..fbcccb86bfd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.keep-origin.http.html
index 51b796faff4..d2ea91e2d70 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.no-redirect.http.html
index ae910ab09db..1ce5e1167c3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.swap-origin.http.html
index 6b96a09c179..afdfbaa4392 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.keep-origin.http.html
index 89eb976029d..76040acbbdd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.no-redirect.http.html
index d099040c32c..0f31d22b626 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.swap-origin.http.html
index 026635498c0..41626c4de98 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.keep-origin.http.html
index a88a0727bf6..a0252bb4698 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.no-redirect.http.html
index 04cc2e35ebc..1c119381214 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.swap-origin.http.html
index c877963cb9a..764ffe53f4b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.keep-origin.http.html
index 5a1af893987..5cc8685d8d7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.no-redirect.http.html
index 4c9fb03cd2b..4743875860b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.swap-origin.http.html
index d9ab586df6e..ca673fd821e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.keep-origin.http.html
index 9631d810efd..b9ee419b2c5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.no-redirect.http.html
index 6e03cdab423..95e968cd67d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.swap-origin.http.html
index f3ccb1f5042..8eac9af58b6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.keep-origin.http.html
index 27266df1e47..6483c72a3e2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.no-redirect.http.html
index 7299286879b..3f32c6b4f9c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.swap-origin.http.html
index 53ae37b0509..1dfd817473f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.keep-origin.http.html
index bb0fc8062f5..4c6a93cfc28 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.no-redirect.http.html
index 6d4ed57e23c..c0411dc5651 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.swap-origin.http.html
index 719a6354f27..d67e02ba7e4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.keep-origin.http.html
index c39fdd14a44..6e90c0f4b8c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.no-redirect.http.html
index d594f8b75eb..9f91b2485ee 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.swap-origin.http.html
index 2fbe12fe8a8..138f3358bd7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.keep-origin.http.html
index 2a587ca4b11..78ece0b19b8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.no-redirect.http.html
index d0be10f9bcd..7a5879d9125 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.swap-origin.http.html
index 85414f14de3..9d3381830e4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.keep-origin.http.html
index ec3dcdea341..55e030b820d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.no-redirect.http.html
index 196770f8da6..3827e7a5c51 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.swap-origin.http.html
index 151d87662ab..f767e02e2f0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.keep-origin.http.html
index c186fa19693..0c2128b8c16 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.no-redirect.http.html
index d0c49af446f..56ba08f9a4b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.swap-origin.http.html
index 594be914a13..8d2bb23f435 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.keep-origin.http.html
index f0acef6c59e..b6ac13a2098 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.no-redirect.http.html
index 569f8c1ded6..9f2e599719c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.swap-origin.http.html
index c027bcd884d..8b940c905e9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/sharedworker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/sharedworker-classic/same-http.keep-origin.http.html
index 6e6160aa74a..1f4d8c219fe 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/sharedworker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/sharedworker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/sharedworker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/sharedworker-classic/same-http.no-redirect.http.html
index 03b0a5ecd0c..8cfd6e34217 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/sharedworker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/sharedworker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/worker-classic/same-http.keep-origin.http.html
index 9c1caa904e3..6fc428e4dd5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/worker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/worker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/worker-classic/same-http.no-redirect.http.html
index 954ed8fa62a..1609876cd6e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/worker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/worker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/worker-module/same-http.keep-origin.http.html
index dd8d5e58104..f1e900f684a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/worker-module/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/worker-module/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/worker-module/same-http.no-redirect.http.html
index 282912b7da4..ba6fe6d2e21 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/worker-module/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/worker-module/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.keep-origin.http.html
index 71192894cea..4b2c48698ac 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.no-redirect.http.html
index 60033300dd7..9a705257078 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.swap-origin.http.html
index be62704fe35..affed7867a0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.keep-origin.http.html
index 7d4131664e8..70893f732ee 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.no-redirect.http.html
index 84e65d398a1..b51c293adfa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.swap-origin.http.html
index 1b7e54f4ff6..242a50ca8ce 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-http.keep-origin.http.html
index 9f3d16e85d2..e48d5780d19 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-http.no-redirect.http.html
index 40cd238de98..2a116be0777 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-http.swap-origin.http.html
index a912773ca20..6dbf270a389 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-https.keep-origin.http.html
index b0eda9910fd..840f039a217 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-https.no-redirect.http.html
index ecfc6a58475..8a66808cf18 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-https.swap-origin.http.html
index c166e90808a..957da8954e7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html
index 825868a0d4a..d95d029c4d1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html
index 9a6f5e974fa..f62a07ba69b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html
index 476831fc952..f0d9894ddb9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html
index b1a85655263..883b64530ed 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html
index 9cac2ec761e..8561f5837f6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html
index 1ceb25c3f43..fb453f9164a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html
index 5865d6b2e85..850adf2b801 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html
index 9fd2445d62e..bc8a5d8cef7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html
index e88bd9105d1..4affb593312 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html
index 209fa3c48b0..9b61017ed61 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html
index 6672b1eace0..733c5a57512 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html
index ec17b1f121f..4e95f1b7317 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html
index 040a9ecd15a..c24c8e289cc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html
index aead299f56e..23c032504ae 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html
index 320ee1d1bb6..ced06c88a86 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html
index c3fe91666ac..7dfaa1173ff 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html
index b29d9aa1c1f..c35077e44ed 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html
index 98f3feeaace..07d3dd8e8d4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html
index 5bc48e9a9d6..60587faa741 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html
index d4ff0dadc7e..3c1accd8724 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html
index 204e954e926..6bcf65289b2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html
index 9f7eb31518b..32a8dbdf5a8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html
index 7e9a21aa0a8..4058df83edc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html
index 97e52fb10f8..71926d873fc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html
index af0cc4307ae..9da696654eb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html
index 84467bc3595..db8d0a65138 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html
index fe2467f192a..a2a6024d603 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html
index 0e411453564..1c7face5c0e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
index 1c597c658dc..5420401a514 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
index ad9d89802e6..0406d3b5274 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
index 5309e3f2814..8e75b5d5054 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
index 0d049ac6a82..3dce0c4ed7e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
index 1eb934e59c4..36879c3edba 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
index 3e1e5f9a2af..0ace07b1fc0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
index 8ec49cd9c46..28d2b6dcf70 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
index 85d6718db62..00542aaf0a3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
index 476b90e4473..45696b4f797 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
index 8199f567466..d9e2037110b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
index d21736b0595..00cf01ee39e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
index 7980103efc0..2ba482a7f55 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html
index 10227a80fd8..f0d25f6aec9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html
index eee16a3120b..03b247dd29e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html
index 798b35cb334..730ac91e27e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html
index c62baf10363..08b59b82833 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html
index 2193ab2d0da..123968f4f71 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html
index cfcfef7529c..63a0c36951d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html
index 6ff96f572f3..c8635e6d00a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html
index 287c94b48ae..7f7c1aab9ac 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html
index 5eff119a903..0a7ef5b0aa6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html
index 0a8d85687ca..7975ebfca60 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html
index 4b310dc6d79..e93bf7e9aab 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html
index feb3353ff9f..486e6c3f2b0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html
index a4943affd87..4b2de714529 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html
index 8a4f62db322..70c909edabc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html
index 451b518e32e..491eb5ebe86 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html
index 7c9df1c6318..264c2b2b328 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html
index 3cab708f9b3..a80db6050e6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html
index 93fcde08e5a..0a1e56766c7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html
index e555bca394e..7d472a2c592 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html
index 776a27f16b2..f276f4cfae1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html
index 2a8826b510c..a66e37d0d3c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html
index e530e58910b..485e389d06d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html
index 347858d4e09..e6ce17b5339 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html
index 92d6b4e701d..170aee6fadc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html
index 4a4025c90e7..fd06ec7e3a4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html
index 6802c97b51b..f7781f54bcc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html
index eee53b0fc2e..6195157f8ad 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html
index a3e3a73a8de..f3c72b0bb22 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html
index 5047e9b1911..4f7cd44023e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html
index a7622186b70..04f96300064 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/a-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/a-tag/cross-http.no-redirect.http.html
index bb08e6adda7..879a92dc310 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/a-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/a-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/a-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/a-tag/cross-https.no-redirect.http.html
index e14f676b278..2c9ad195ba2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/a-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/a-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/a-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/a-tag/same-http.no-redirect.http.html
index 1a84ef38e55..ebf1c4f6178 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/a-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/a-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/a-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/a-tag/same-https.no-redirect.http.html
index 8b032e959e1..59aef9aeefa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/a-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/a-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.keep-origin.http.html
index 725100262be..d8a89812f57 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.no-redirect.http.html
index db3025ebdae..722f1808748 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.swap-origin.http.html
index d476f8c1b60..f383b2d5372 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.keep-origin.http.html
index ead73b6f25f..155c67135ca 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.no-redirect.http.html
index fa8ceffe6ff..bbc9416ab75 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.swap-origin.http.html
index 25caf44c75a..265c281baa0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-http.keep-origin.http.html
index bc7c35b3f48..4017c03cefa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-http.no-redirect.http.html
index d5a56542c5d..dad1873988a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-http.swap-origin.http.html
index 8a96d666699..e74fc622778 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-https.keep-origin.http.html
index 2b0938e2b42..ce881eb9fef 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-https.no-redirect.http.html
index bafbbb5d681..fabbbd21121 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-https.swap-origin.http.html
index 4456a15d483..bf43d43d5e5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.keep-origin.http.html
index 55444874b3f..0c7fac4128d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.no-redirect.http.html
index 98e8ca5d75f..f8b81d6c5ac 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.swap-origin.http.html
index d9c9bdb7875..9d74cdb6a36 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.keep-origin.http.html
index 5cb0c895012..56ff426017a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.no-redirect.http.html
index 0a135da73bf..ef8c197637d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.swap-origin.http.html
index c03ea87c786..478408137b7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.keep-origin.http.html
index de7deba03f4..5401aaf7d3b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.no-redirect.http.html
index a84fdb7e1a0..e6f0b5d261e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.swap-origin.http.html
index 3c55c5fc8e0..40764e45643 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.keep-origin.http.html
index 3d1f9ff9605..c10031063f9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.no-redirect.http.html
index aed5c18d25e..f563a46125d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.swap-origin.http.html
index 73ec3c417cb..ae9ca52976c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.keep-origin.http.html
index bb546ba8946..9d1ea9f839c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.no-redirect.http.html
index 3cbfb0bf7e2..dbe5de6b53b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.swap-origin.http.html
index ce09cb1e14e..cd2e8423c6a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.keep-origin.http.html
index ece42cf99b6..0d514cdc89d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.no-redirect.http.html
index 5b9cd9fdf5b..b38c93f408d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.swap-origin.http.html
index 6bad60e7ec0..0e2f607d08d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.keep-origin.http.html
index 1d65c6c46b2..1dca89af901 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.no-redirect.http.html
index 9676d02bf8c..0ecfe9ef099 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.swap-origin.http.html
index 3e1d17b8393..333a8993762 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.keep-origin.http.html
index e746335e83e..790cd4e41cd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.no-redirect.http.html
index b5355cd168f..9292db10083 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.swap-origin.http.html
index 54ebd185be9..f5ec1826068 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.keep-origin.http.html
index ebd17499a18..b840e4f2a0a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.no-redirect.http.html
index 2856881dafc..534e529033d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.swap-origin.http.html
index d19393dc7c3..b8d2afe7109 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.keep-origin.http.html
index c5c5e96891e..b64bf9ea708 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.no-redirect.http.html
index bfccf50bd9c..365b63113e0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.swap-origin.http.html
index c99eb3d0d25..5b3e1d3b706 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.keep-origin.http.html
index e5304ba9ef8..ee4673baba1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.no-redirect.http.html
index bf779131353..08b97cdae13 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.swap-origin.http.html
index 32cbdb37956..3cd2ab61106 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.keep-origin.http.html
index 10fc4f1b857..1d9955b8c02 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.no-redirect.http.html
index f8c5e8f2f48..bacb5c2d845 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.swap-origin.http.html
index dd011515107..c8500034e90 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/sharedworker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/sharedworker-classic/same-http.keep-origin.http.html
index 98e4d99a797..2a75be4f955 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/sharedworker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/sharedworker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/sharedworker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/sharedworker-classic/same-http.no-redirect.http.html
index afb40f0fee9..55d41d7ab42 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/sharedworker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/sharedworker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/worker-classic/same-http.keep-origin.http.html
index a80ea70f694..0160add3274 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/worker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/worker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/worker-classic/same-http.no-redirect.http.html
index ab662508f13..54e517eb213 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/worker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/worker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/worker-module/same-http.keep-origin.http.html
index 771d1d985a0..41447ff2ab8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/worker-module/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/worker-module/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/worker-module/same-http.no-redirect.http.html
index f0392f3c5ce..288fdb4f856 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/worker-module/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/worker-module/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.keep-origin.http.html
index e3b3c2a1399..682e787b2a1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.no-redirect.http.html
index 149baa1e3b6..cf072fcd674 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.swap-origin.http.html
index 7944aad538d..d75278d0a18 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.keep-origin.http.html
index a34ab7cd33c..616b0f73288 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.no-redirect.http.html
index cafd514f703..d710b2e9746 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.swap-origin.http.html
index 48b1c0ade67..8b978844e25 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-http.keep-origin.http.html
index dbb9e89d33d..d8eb56a88ae 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-http.no-redirect.http.html
index d6c4e1ac17c..875ddb2bdfa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-http.swap-origin.http.html
index 71d5f84da68..54983bda414 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-https.keep-origin.http.html
index 9142e28d035..9f312f52730 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-https.no-redirect.http.html
index 3574fe1d77a..62dcd079680 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-https.swap-origin.http.html
index b43d26fdf85..bda85aa1a5a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html
index 2f9bf4948b7..cb2416d1ba1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html
index b4f6755001f..bb2705df821 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html
index 91716ed5500..e239f5116b3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html
index 13962b2fb93..66aca52e72f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html
index 81fa0738dbf..cbc8344fa4e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html
index 8a97a1b11e6..70a085dfe98 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html
index 51e3175054f..a6d82874a15 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html
index eca42353d95..c5be9221fbd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html
index 15a7becf78a..7f91dcae397 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html
index 4f30a0f57d2..0cac5d15b39 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.keep-origin.http.html
index cdfc2f0941d..fb5d40554d0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.no-redirect.http.html
index 265e2b3f670..5551a46c19e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.swap-origin.http.html
index 71ad1eccab6..420cbf2e805 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.keep-origin.http.html
index f3df4bc03bb..1938e64407b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.no-redirect.http.html
index f66c9a3a45f..959079f10c5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.swap-origin.http.html
index 9d713465967..b348511386a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html
index 1c6da90ba82..b8a4557f0e8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html
index ddfc94ab091..585a6ad0643 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html
index 2d57b4d6717..59b25e53097 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html
index 9840fc2729d..b11b9b46931 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html
index bc4520dc8e3..f472621e72d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html
index 7327dde1bcd..1ff5e6faa46 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html
index db006065744..f5e8eafc3d6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html
index 36d1ea734ea..21c4869251d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html
index adeaf62dfb3..4b848595108 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html
index 4e4272ed697..60fab8aed6b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html
index 7768a9331ab..82f251ba2f1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html
index ac17b11540c..bad2a522c5a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
index d3e69dc8e4c..1f8564092dc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
index dc4ddf3577e..c019032100e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
index e9fa7073b37..3bcf5f028ed 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
index b8527ec9a73..9e9f766bdc4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
index 7dd17572c46..ae795f8e4be 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
index 3ebee1a90d6..d375d1816b0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
index 509306d3128..c1d6f1aefc1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
index 73d37a91bdf..57778a20275 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
index 0e283a200c9..0513896dd03 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
index 74f45964511..a8cd85c7647 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
index c2bcdb50927..2de77f80ab8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
index 74b653dadc3..a2807ff4bbe 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html
index 8a124ad7796..3a31579f8f4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html
index d8e48236ef7..d52d043b9c1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html
index 3b76a5af2db..3a59a9ff9fd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html
index 4a60422d6e7..804c94b5789 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html
index 902777546da..f4b73bac544 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html
index e01f28e6dea..e1603819bfc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html
index 58bd36352f8..2ff3b7bc7b0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html
index a23a7e97434..dc2e8b645ab 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html
index 9fc586f6a43..07f68976203 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html
index 6b7c3b0ddff..6e30fb4c157 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html
index 4ff8f587140..a8e5a940172 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html
index 7473fcbea08..40a8d05146d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html
index aacb86fc696..250b2465c28 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html
index 4db199605a0..bc4f919b5c5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html
index 2283ad9b3b7..42d190582ef 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html
index c6df272901f..94dfe6cc3e3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html
index 4703eb9ec4a..96139e7207b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html
index ebf282323e7..565a40ba180 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html
index 14990ee5259..6c57ebcaabd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html
index f59130cb183..d59e005046e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html
index 65aa00870fa..0d63e2f1e6c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html
index ad6fc16271a..e8f19f58366 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html
index 152e3ebce6b..eb6b799f457 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html
index c2976879b82..1779d2e094b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.keep-origin.http.html
index 0994e0f5873..aef8bff3f3f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.no-redirect.http.html
index 7dc61a84f23..8ae5d68f77b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.swap-origin.http.html
index 4cb23fb9e4d..970bbaff9b7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.keep-origin.http.html
index 6d0b6c5830e..23be352d56b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.no-redirect.http.html
index 8ff03c8a5a8..eb2d87505a1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.swap-origin.http.html
index b790cb1241a..41739cbf6a3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/a-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/a-tag/cross-http.no-redirect.http.html
index 9277c28947a..dbbd37f40bf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/a-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/a-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/a-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/a-tag/cross-https.no-redirect.http.html
index 1dbb1fc5ccb..7ccc0a08e53 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/a-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/a-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/a-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/a-tag/same-http.no-redirect.http.html
index 894af1da5df..9adbae32e50 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/a-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/a-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/a-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/a-tag/same-https.no-redirect.http.html
index 9881bdc4ee7..3bd0461fc30 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/a-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/a-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-http.keep-origin.http.html
index 63fd2be9f96..b1b86be1a4b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-http.no-redirect.http.html
index f564fbebc57..5b18c7be6e9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-http.swap-origin.http.html
index 446f7076ee7..242346a3997 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-https.keep-origin.http.html
index a6a9a8a1b22..28153a8b4be 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-https.no-redirect.http.html
index f0f6bb6135e..8d35aee072c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-https.swap-origin.http.html
index 9408a75c5b5..8a6e9ef07c7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-http.keep-origin.http.html
index c53527a5f40..caf83ba5dd4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-http.no-redirect.http.html
index 2e69c9b6719..d8b4861670f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-http.swap-origin.http.html
index 4ccb297816c..f09e377c66c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-https.keep-origin.http.html
index 72a2bbb19b1..ce38cffef99 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-https.no-redirect.http.html
index c1a1d90beee..b4f3cdd8982 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-https.swap-origin.http.html
index 4202ef50a80..cb4af3e4586 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.keep-origin.http.html
index ac008da94a1..791330003b9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.no-redirect.http.html
index 449d06a8424..f7de0c55e24 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.swap-origin.http.html
index 64e76c518bc..dc417fc3c6c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.keep-origin.http.html
index c6c981ceb44..9a1c6a3a891 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.no-redirect.http.html
index 2405cdbd0dc..64606fd08af 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.swap-origin.http.html
index 40bc9a0e648..d00db3d73c8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-http.keep-origin.http.html
index 1caa40ed81e..3cb422b0834 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-http.no-redirect.http.html
index 232dd065279..ca4746f5a4e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-http.swap-origin.http.html
index ef73d2a759e..262bdc5b01d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-https.keep-origin.http.html
index ca2ea3a1241..c92b2492103 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-https.no-redirect.http.html
index b72264e1ff2..0817c694738 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-https.swap-origin.http.html
index aff2a9d6678..999f3ff1655 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/cross-http.keep-origin.http.html
index 5f355e5562a..4c3c1620ea6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/cross-http.no-redirect.http.html
index cc5e5ad7815..4eb51ac12fe 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/cross-http.swap-origin.http.html
index 26cb56fd806..c3561800fdb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/cross-https.keep-origin.http.html
index b56de8a740f..e9edcb8e0e8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/cross-https.no-redirect.http.html
index 1ac715a376c..69f3bbe7c94 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/cross-https.swap-origin.http.html
index 80cc9e4d1b8..7dd8e299d49 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/same-http.keep-origin.http.html
index 6f33c342c8f..51d092f64f2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/same-http.no-redirect.http.html
index 6b9d3f058e4..92fef43c906 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/same-http.swap-origin.http.html
index 270738fa85a..dee8ee1e5d1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/same-https.keep-origin.http.html
index a76c575c1fa..0067b947d16 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/same-https.no-redirect.http.html
index ddb84cb3b67..f2cea06102c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/same-https.swap-origin.http.html
index 48d5905e574..bd774c1b77d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-http.keep-origin.http.html
index 5968953f459..68f18780625 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-http.no-redirect.http.html
index f766b2c82a6..c11ef15b325 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-http.swap-origin.http.html
index 1165a2e082e..48e1f0e20f3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-https.keep-origin.http.html
index 02bbaa369d7..19051b43f3a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-https.no-redirect.http.html
index 955e322ee93..e144b2cf9d4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-https.swap-origin.http.html
index 6c099d32325..2065843890b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-http.keep-origin.http.html
index 4a136fec3c6..239199198dd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-http.no-redirect.http.html
index 8465a79e079..00e78e9f0b9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-http.swap-origin.http.html
index 80babb63389..417e470c033 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-https.keep-origin.http.html
index 9e05dfbbe07..9ca3846934a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-https.no-redirect.http.html
index c95c268b242..a3415b9cf9b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-https.swap-origin.http.html
index 9a225bb307b..b6f1e5ccdf7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/sharedworker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/sharedworker-classic/same-http.keep-origin.http.html
index 84fcecc5988..e7a037d065d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/sharedworker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/sharedworker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/sharedworker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/sharedworker-classic/same-http.no-redirect.http.html
index 140c27b5bb5..480fc6cc63f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/sharedworker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/sharedworker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/worker-classic/same-http.keep-origin.http.html
index b10fe3c0007..3053f3001e7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/worker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/worker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/worker-classic/same-http.no-redirect.http.html
index 4d67e3b9791..2054f171bd1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/worker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/worker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/worker-module/same-http.keep-origin.http.html
index 5c502e16a14..3286e930b9a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/worker-module/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/worker-module/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/worker-module/same-http.no-redirect.http.html
index 98c6d31750d..a491039ccdd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/worker-module/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/worker-module/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-http.keep-origin.http.html
index 4bbdc3c48e7..c25b2d23116 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-http.no-redirect.http.html
index 68f03afdc70..0d4b092ce93 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-http.swap-origin.http.html
index 7b3473d8c9d..06d3afbe451 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-https.keep-origin.http.html
index 47c53c2ddd0..ed1794be128 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-https.no-redirect.http.html
index 7fa4360968a..d448e32df0d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-https.swap-origin.http.html
index 9b08cf1b89c..a1400f7abb3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-http.keep-origin.http.html
index 314830775af..b47d899fdf7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-http.no-redirect.http.html
index abbeb0eac41..3735a14edbf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-http.swap-origin.http.html
index f190467331d..8a9aa1ce267 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-https.keep-origin.http.html
index 0461c4c2586..b336cb1dce5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-https.no-redirect.http.html
index ec81dadafb9..22f8cf7fb4b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-https.swap-origin.http.html
index 154335e620e..5feba3f0d69 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/a-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/a-tag/cross-http.no-redirect.http.html
index c9e0a25db45..cf9f09f4aae 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/a-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/a-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/a-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/a-tag/cross-https.no-redirect.http.html
index 9a18f4f77ed..3a7d1707a17 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/a-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/a-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/a-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/a-tag/same-http.no-redirect.http.html
index 4a6d64d1169..c47c7aea18d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/a-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/a-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-http.keep-origin.http.html
index f4c9d47e8a0..4a7a1cda722 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-http.no-redirect.http.html
index 922aee1bfaf..75c47f4e9ba 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-http.swap-origin.http.html
index 497aed51839..29c901d7d14 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-https.keep-origin.http.html
index 9874739ecd5..aef239c7af2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-https.no-redirect.http.html
index f444865432b..69ff999ba1c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-https.swap-origin.http.html
index 6875451d9ef..ad689e6c84d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/same-http.keep-origin.http.html
index 47ac06ab7e3..b5e05b616ee 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/same-http.no-redirect.http.html
index c8561b9acc6..f7edc26eb0b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/same-http.swap-origin.http.html
index 6d53197196c..857d4bd8f4b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/same-https.swap-origin.http.html
index 960445ed130..e2da502c821 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.keep-origin.http.html
index 96d8ca4adda..05955e9f830 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.no-redirect.http.html
index a75887a397a..ed741ffc835 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.swap-origin.http.html
index 2e4a7cf989c..1748043b115 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.keep-origin.http.html
index 1ae45f67922..8d8541939c0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.no-redirect.http.html
index 29f9ef18070..f7b99eae783 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.swap-origin.http.html
index f06f7ea504e..45617b38dfc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.keep-origin.http.html
index 8f022223fb6..ac88db60a1e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.no-redirect.http.html
index e48f91806f5..cb38caa9eee 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.swap-origin.http.html
index 64fe1b9c599..284b3d3cb7d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-https.swap-origin.http.html
index 6d947108e8c..b0d1cc6b995 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.keep-origin.http.html
index 66186545f7a..6c0ac8cdb44 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.no-redirect.http.html
index 98733bc2d50..ac6428b3601 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.swap-origin.http.html
index 6f964dc0f21..bdfdbb422e8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.keep-origin.http.html
index be896539f79..250ea86ec8c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.no-redirect.http.html
index 3019d368b20..95b99976e55 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.swap-origin.http.html
index 51dada9e836..42d4a46fd2f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-http.keep-origin.http.html
index bcff54cde99..517651319bf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-http.no-redirect.http.html
index 9c8629cb572..38069258111 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-http.swap-origin.http.html
index 588baf9c270..432be2d5d6f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-https.swap-origin.http.html
index b41a6ff4d6f..0fd23f84c48 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.keep-origin.http.html
index f3830952f48..548f0bb2052 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.no-redirect.http.html
index 1a744125943..bb7263fc365 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.swap-origin.http.html
index 25c7a782fea..2ec0e5787ce 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.keep-origin.http.html
index ca940ab9a01..30100195f12 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.no-redirect.http.html
index 14affb7ffd2..f760e844070 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.swap-origin.http.html
index 545ccb26157..d3b06c12972 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-http.keep-origin.http.html
index 1f3ce019c19..67efd10c468 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-http.no-redirect.http.html
index 8eb22efd17a..63170ba8246 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-http.swap-origin.http.html
index 5ca347a091c..e9820afa490 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-https.swap-origin.http.html
index f5a5c14ff79..7be69367303 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/sharedworker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/sharedworker-classic/same-http.keep-origin.http.html
index 3195a862c5b..76a444d3bb9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/sharedworker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/sharedworker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/sharedworker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/sharedworker-classic/same-http.no-redirect.http.html
index e171e121b4b..f734c527430 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/sharedworker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/sharedworker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/worker-classic/same-http.keep-origin.http.html
index 23395eff687..410e398776a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/worker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/worker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/worker-classic/same-http.no-redirect.http.html
index fd86e10340f..ce29f720852 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/worker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/worker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/worker-module/same-http.keep-origin.http.html
index 4f1ef7c8382..573908ca89d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/worker-module/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/worker-module/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/worker-module/same-http.no-redirect.http.html
index 4814b06446e..5d1795d03b4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/worker-module/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/worker-module/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-http.keep-origin.http.html
index ab12f602fe9..6551a65f0d9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-http.no-redirect.http.html
index e0ef9be7434..aa6a9afad07 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-http.swap-origin.http.html
index 3607fac2a44..d2127b5dee6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-https.keep-origin.http.html
index 95410ec6f75..33930eb401e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-https.no-redirect.http.html
index 56ac1a8b29c..9a255c548d9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-https.swap-origin.http.html
index 4745c3b2342..1aeca79c82c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/same-http.keep-origin.http.html
index 12b6d3a690d..5aa24a26381 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/same-http.no-redirect.http.html
index 08aae0baa54..491fd099410 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/same-http.swap-origin.http.html
index a6fef380f2b..1ef1bbffd1f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/same-https.swap-origin.http.html
index 1c7329fc128..7fb51684dcc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html
index 55982aff7ec..cc6bcdf625f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html
index 07ca09b806e..5a6b4a56309 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html
index 4ae845cb8b6..a1075a9575d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html
index bddfeb1fbb6..5ad2d96ce41 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html
index 50cedb64ba7..988502d5c14 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html
index 58a5f0b118f..02f77c18b91 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html
index 43142b08d39..fbf506d0629 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html
index 7ed35744ce6..7d6907b9c1f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html
index 27b58b9c237..7f19373a1ba 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html
index da53bcee334..4fbc60d3db2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html
index cd3a9574fce..9952f1de972 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html
index fbadd42b519..af220298327 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html
index 994e27ddc04..e0ce6dd98a5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html
index c08c6406d5d..edd55f4b4f3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html
index 8dcd58f6fb4..2c22f125f95 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html
index 816b3e8b294..c6dd6fdd727 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html
index 960b86cee45..cdf60a63e44 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html
index 4c76f6f5af3..13f2be668c2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html
index 42ebcdaae24..51177141400 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html
index 8614e3800ad..9f0e08f64c4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html
index 7d6c26e270b..0c03e1dfbea 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html
index 4c220052c96..09f87f74c92 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html
index 60691c89d30..812ce4e688a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html
index 3624ecbf962..54a39ceae1d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html
index 0f8e9cfcda6..62dc4390284 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html
index 7de74e127a6..8d2889e767c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html
index a4879636d55..4f50b75d43e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html
index db2da5c92cb..8c5189c4953 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
index 50a4b747ae3..b0dd98545c8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
index 9bc48713fe4..d09adb8dedc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
index 2560bacb16c..378ce57c0e8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
index 85acfd7154e..b55b0041ecd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
index fe8d90e1424..d2b6def5405 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
index 5e3abd1dd6d..9b5bd51183b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
index bb64a89fe71..019b5d93145 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
index d5892747dbd..4d9e585c5f5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
index b7c335e5079..c85b06b4995 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
index 1fca3f13a4d..09d2ca1682a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
index a840109490f..69b57be84e3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
index cc7d5979056..2353fc1a85f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html
index 1fb432779f2..39f774e9b3e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html
index 68058958693..9a5c3d7ff3d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html
index fbe0e2913a1..9e5f5a5b248 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html
index d65ee887e34..16c81efe755 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html
index 0c9209428f7..5dd4c12ce9a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html
index 8febd856f13..3586e60a9a2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html
index c4da26788d4..f53bbfaa7bd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html
index 5d7684c5df9..9b52526335f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html
index 2c28e914f2f..85914f54ada 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html
index c066c580380..f6b0d4f6ba1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html
index 773a7becd07..cb6a6f119d1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html
index a776f68c19b..99b85ca13ed 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html
index 862794d9937..0fb1c87cb05 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html
index f02587e774b..e3332c01506 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html
index 1fe0b49d5b7..57bac4ca139 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html
index 4661e5463cc..f32749be834 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html
index 972e24a30ea..0c9e0abd303 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html
index c092db5629f..fa8d80bc64f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html
index 4ed4a866cec..eb4cc3a2d9b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html
index 8c6d47ec1d4..cf66130cc63 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html
index fa0114be1fe..25f9c3d290d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html
index d5e6d4a3f77..f62e0efddf4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html
index fdd422c0715..7903fc88c90 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html
index 0a39f27976a..4294a65ed6b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html
index d08edb1be3d..7e97967aa55 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html
index e8edaf55446..b8beff2144a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html
index c3b6c66b9d6..25b092b4305 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html
index 398963dfe41..6c5284ea933 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html
index f18a99d5032..63435e56073 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html
index c8d83790059..abd13effa3a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/a-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/a-tag/cross-http.no-redirect.http.html
index 251ef530699..b82365d6329 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/a-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/a-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/a-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/a-tag/cross-https.no-redirect.http.html
index cb3e32825b2..a0938dc9df4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/a-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/a-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/a-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/a-tag/same-http.no-redirect.http.html
index 84160270242..a3403c55ae2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/a-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/a-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/a-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/a-tag/same-https.no-redirect.http.html
index 045462b5758..8cf2efe896d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/a-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/a-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.keep-origin.http.html
index 06f137200af..ad8e36fa9f5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.no-redirect.http.html
index a1eefb2dab1..e0136aaa278 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.swap-origin.http.html
index 40ce944f4db..dc86b8ba604 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.keep-origin.http.html
index 7c544ce7922..fbcdcc936bb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.no-redirect.http.html
index bc1c75ca3c9..cdac8ead937 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.swap-origin.http.html
index cad9835a514..6ab6b2c6425 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.keep-origin.http.html
index 5dc3e608cb5..6e221cc8bfe 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.no-redirect.http.html
index a6c4798d698..9e29fb706e2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.swap-origin.http.html
index 84f9933294c..7e5a0cb91ef 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.keep-origin.http.html
index d0b4aa255d6..4bea553a94c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.no-redirect.http.html
index 16160d687cb..72b783f733e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.swap-origin.http.html
index 0168534be40..9652e9ee9f0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.keep-origin.http.html
index c7418279fb8..d51f75b582f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.no-redirect.http.html
index 88bbb6f74d9..6e6361f4cde 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.swap-origin.http.html
index 726cb8f47b6..0bb6615b7f1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.keep-origin.http.html
index 95b2888091c..16e0a0979e7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.no-redirect.http.html
index 0a4a78f01c7..cc2c883d66d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.swap-origin.http.html
index 77210abfdf9..36dc5e754be 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.keep-origin.http.html
index f255b9dcd0a..2fec579a5b9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.no-redirect.http.html
index 620c19f11af..0cb68214226 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.swap-origin.http.html
index 6c8609763b3..5e7edca5585 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.keep-origin.http.html
index b423313e644..5c65f3e00bb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.no-redirect.http.html
index e686e40d4f0..ab4779616b2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.swap-origin.http.html
index 1087eb50dad..7b21011501e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.keep-origin.http.html
index e09e61d85a9..3b867e1c0e9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.no-redirect.http.html
index 40105a66df4..84be9597065 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.swap-origin.http.html
index 273fe59a177..1110466f93b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.keep-origin.http.html
index 5b6cb7d0d0f..ab93ca5545f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.no-redirect.http.html
index 4df54d782c9..9889ae09ae0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.swap-origin.http.html
index 66b10ff04f4..e2aac2e290e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.keep-origin.http.html
index 2024fa42bf4..b4dde1fa54a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.no-redirect.http.html
index 10962adc2f4..61157283e0d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.swap-origin.http.html
index 94f38db2bfa..fd85fb44bbb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.keep-origin.http.html
index 3710c1c96c7..4facdd09076 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.no-redirect.http.html
index 1914626ea29..56022784397 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.swap-origin.http.html
index f3c25498ad2..118ab6d668f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.keep-origin.http.html
index bf1a4d6db3e..10a75bd7b8f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.no-redirect.http.html
index c3230d10d65..e556f69a24a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.swap-origin.http.html
index 0e35ab3a6a4..7672fb071fd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.keep-origin.http.html
index 6ba7329d294..b0b9e88534c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.no-redirect.http.html
index 54cfa963d9e..9ff93360b5d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.swap-origin.http.html
index 6961299bc51..ee23beb5e9d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.keep-origin.http.html
index e2dc274d0e2..2f011e5d23a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.no-redirect.http.html
index 1c48443a661..31b94f50348 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.swap-origin.http.html
index c198959d7ed..f004d3af29f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.keep-origin.http.html
index c77e12117a5..58a295eb3ae 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.no-redirect.http.html
index 6a07112d049..6df3e8f3af2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.swap-origin.http.html
index e73e48068a4..a184016ae7a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/sharedworker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/sharedworker-classic/same-http.keep-origin.http.html
index b7dba7b8fe6..4dea9a7c19c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/sharedworker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/sharedworker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/sharedworker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/sharedworker-classic/same-http.no-redirect.http.html
index 4a211294bf4..eb2572bbf7e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/sharedworker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/sharedworker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/worker-classic/same-http.keep-origin.http.html
index 638c68b4665..46f300c1d7b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/worker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/worker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/worker-classic/same-http.no-redirect.http.html
index addcc15dbe3..c4b07b27b68 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/worker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/worker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/worker-module/same-http.keep-origin.http.html
index 98905fb317e..b0ac1c29b17 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/worker-module/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/worker-module/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/worker-module/same-http.no-redirect.http.html
index 9c5dd969084..cd1e64a3091 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/worker-module/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/worker-module/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.keep-origin.http.html
index 741c874ad32..0e9e15547d3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.no-redirect.http.html
index b2e574c1d11..c26dfcf033a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.swap-origin.http.html
index 8af9fd6eae4..bd586a44324 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.keep-origin.http.html
index 86e0d4eae6a..88959e93534 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.no-redirect.http.html
index 26460c3bd71..be36467a4d7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.swap-origin.http.html
index c68cc7e8eda..1ef6151c5c2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-http.keep-origin.http.html
index 950af0c61d4..077f319007b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-http.no-redirect.http.html
index d4ae93bb73f..493064ecada 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-http.swap-origin.http.html
index 98aea077294..37546ab43f0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-https.keep-origin.http.html
index 4a711f7a78b..9a136ff3a7b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-https.no-redirect.http.html
index ff444343b8f..4c9ca2c3d9e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-https.swap-origin.http.html
index cf57a0a574a..13ff80c9f13 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/cross-http.no-redirect.http.html
index 307e935cede..2a4fdc71d69 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/cross-https.no-redirect.http.html
index a4529bcf1f6..bee2563bc68 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/same-http.no-redirect.http.html
index 6c1dc71ba84..3cf7c4cfa08 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/same-https.no-redirect.http.html
index 9431a176524..5d31dc5a839 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.keep-origin.http.html
index 5043a93c206..9f0f73c6a16 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.no-redirect.http.html
index 46ce6978ba6..f0b082be6e5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.swap-origin.http.html
index 74da7c14fc1..7195fe93f6b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.keep-origin.http.html
index ca6825c633f..5ad161743aa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.no-redirect.http.html
index 31472d6aebb..9b6e6dcbb86 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.swap-origin.http.html
index 2b83b4e7195..71338b0907a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.keep-origin.http.html
index 7d4734d6c7b..594f9d56379 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.no-redirect.http.html
index 9dfa39e6436..805c88d4d59 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.swap-origin.http.html
index 0a8119c4d47..a356469f7bf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.keep-origin.http.html
index 6d3c2c9c55d..3a117de740c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.no-redirect.http.html
index 267081a290d..53897c4f277 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.swap-origin.http.html
index 8946815cb3b..956b965c6dd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.keep-origin.http.html
index c6e13851e68..e7cc89cccd2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.no-redirect.http.html
index 4b82e5f9617..f6231482cf0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.swap-origin.http.html
index 62b088b40fe..f74efa1a636 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.keep-origin.http.html
index 18d27e6f9b2..e04e26d6e79 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.no-redirect.http.html
index a9467963576..3683e682dd0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.swap-origin.http.html
index d2d9fe9a683..69f3a571d5c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.keep-origin.http.html
index 1a027047499..a8e28bc7d69 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.no-redirect.http.html
index 53bd45e5a29..2e7076e712d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.swap-origin.http.html
index 7292fa7e657..6469fce2875 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.keep-origin.http.html
index df3627a4029..7f0d96d05e5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.no-redirect.http.html
index 82854ae6b3d..f94e656a64f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.swap-origin.http.html
index bda4ac8f7a2..55fb90e4614 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html
index dfb903d27a5..d0523254d79 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html
index f755eb1e6b4..3d3c216767e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html
index 0f84802c709..e09505eb428 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html
index 87948038d62..bb12a372e85 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html
index 01490d5a8b1..4505b348ff0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html
index f5770d24910..5f47b5fd49a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.keep-origin.http.html
index 5ff2659e9f1..00d436a5077 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.no-redirect.http.html
index e8264215ef8..7f6a1eb9858 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.swap-origin.http.html
index 971da6f64ef..99b41223ea8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.keep-origin.http.html
index 9f040e4c48d..32f57765028 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.no-redirect.http.html
index 4710141f4bb..1f57b02808b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.swap-origin.http.html
index 2a89c1f52a6..2bd8be3f3c2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.keep-origin.http.html
index aec7c665c66..8bd7b97ff6b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.no-redirect.http.html
index 7a0821b7e83..21710068400 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.swap-origin.http.html
index 6eca4e51c92..302b9eefc1a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.keep-origin.http.html
index f5dd9359854..f6bc803e80b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.no-redirect.http.html
index a6322387413..b3188ea4315 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.swap-origin.http.html
index fbc8b77ab37..77f2ddf3df6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.keep-origin.http.html
index 680b2291e2a..877c18a7c09 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.no-redirect.http.html
index cd0494a52c1..2de7eef3ff3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.swap-origin.http.html
index 7411f896377..99c31df1f08 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.keep-origin.http.html
index ad33638d07e..c1998fe5f1a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.no-redirect.http.html
index 73eec5a88e3..c2f7da5b355 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.swap-origin.http.html
index cc46af534f1..5f8dbc6f2b8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html
index 7dd104cfd83..f3cead810eb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html
index 259587c893d..a891328397f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/worker-classic/same-http.keep-origin.http.html
index c18924d61f9..5f642933acd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/worker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/worker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/worker-classic/same-http.no-redirect.http.html
index 420f475af40..b93ff265ac6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/worker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/worker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/worker-module/same-http.keep-origin.http.html
index 97d742885e9..98f39536d14 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/worker-module/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/worker-module/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/worker-module/same-http.no-redirect.http.html
index 84dd2dbf986..83322269976 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/worker-module/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/worker-module/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.keep-origin.http.html
index 2b915db9b2c..e2a56f0b063 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.no-redirect.http.html
index 46570c616b3..cf7cd16db2f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.swap-origin.http.html
index 70a9387b596..50db0f4132d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.keep-origin.http.html
index cb52ad0c3b3..4801f40d15b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.no-redirect.http.html
index 4d23b5b1fe5..45832d20c91 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.swap-origin.http.html
index 08cdcda64f0..58816ccaa32 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.keep-origin.http.html
index 0a9468a5cd5..23a6e691d4e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.no-redirect.http.html
index 907dfe46189..20e58baf626 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.swap-origin.http.html
index 0bbd06efbf6..1f87d92a837 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.keep-origin.http.html
index a90ea834061..99b155b87f5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.no-redirect.http.html
index 146bef287f7..c0c2a3374db 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.swap-origin.http.html
index dcecb0d1fb0..f17303f9669 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/a-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/a-tag/cross-http.no-redirect.http.html
index 7b76180b128..911f16d5eb0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/a-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/a-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/a-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/a-tag/cross-https.no-redirect.http.html
index ead7efc9633..9d8064ff882 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/a-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/a-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/a-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/a-tag/same-http.no-redirect.http.html
index 0350e03597c..cdaf18c1d25 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/a-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/a-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/a-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/a-tag/same-https.no-redirect.http.html
index be8155abc71..9a6c2b43a8b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/a-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/a-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-http.keep-origin.http.html
index d6dbf7c38f5..7fa2a77de9e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-http.no-redirect.http.html
index d6b7b1d4b23..bbf1496d07d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-http.swap-origin.http.html
index 228bac96566..989c7934ed0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-https.keep-origin.http.html
index 23a5dc69603..7a596e7f806 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-https.no-redirect.http.html
index 2b950c4a681..bba5c2a55a7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-https.swap-origin.http.html
index 68d8dddf59d..867e64067ba 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-http.keep-origin.http.html
index 68a2919245a..5e004ab5892 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-http.no-redirect.http.html
index 9786e115f45..94176020e86 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-http.swap-origin.http.html
index aeb97a12712..82b9de5fff3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-https.keep-origin.http.html
index 27bf0fb3825..20be1f2f656 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-https.no-redirect.http.html
index f2de2eeabfa..244623b424c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-https.swap-origin.http.html
index 2f059b49d6c..fbcccb86bfd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.keep-origin.http.html
index 51b796faff4..d2ea91e2d70 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.no-redirect.http.html
index ae910ab09db..1ce5e1167c3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.swap-origin.http.html
index 6b96a09c179..afdfbaa4392 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.keep-origin.http.html
index 89eb976029d..76040acbbdd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.no-redirect.http.html
index d099040c32c..0f31d22b626 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.swap-origin.http.html
index 026635498c0..41626c4de98 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.keep-origin.http.html
index a88a0727bf6..a0252bb4698 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.no-redirect.http.html
index 04cc2e35ebc..1c119381214 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.swap-origin.http.html
index c877963cb9a..764ffe53f4b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.keep-origin.http.html
index 5a1af893987..5cc8685d8d7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.no-redirect.http.html
index 4c9fb03cd2b..4743875860b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.swap-origin.http.html
index d9ab586df6e..ca673fd821e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/cross-http.keep-origin.http.html
index 9631d810efd..b9ee419b2c5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/cross-http.no-redirect.http.html
index 6e03cdab423..95e968cd67d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/cross-http.swap-origin.http.html
index f3ccb1f5042..8eac9af58b6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/cross-https.keep-origin.http.html
index 27266df1e47..6483c72a3e2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/cross-https.no-redirect.http.html
index 7299286879b..3f32c6b4f9c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/cross-https.swap-origin.http.html
index 53ae37b0509..1dfd817473f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/same-http.keep-origin.http.html
index bb0fc8062f5..4c6a93cfc28 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/same-http.no-redirect.http.html
index 6d4ed57e23c..c0411dc5651 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/same-http.swap-origin.http.html
index 719a6354f27..d67e02ba7e4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/same-https.keep-origin.http.html
index c39fdd14a44..6e90c0f4b8c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/same-https.no-redirect.http.html
index d594f8b75eb..9f91b2485ee 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/same-https.swap-origin.http.html
index 2fbe12fe8a8..138f3358bd7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-http.keep-origin.http.html
index 2a587ca4b11..78ece0b19b8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-http.no-redirect.http.html
index d0be10f9bcd..7a5879d9125 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-http.swap-origin.http.html
index 85414f14de3..9d3381830e4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-https.keep-origin.http.html
index ec3dcdea341..55e030b820d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-https.no-redirect.http.html
index 196770f8da6..3827e7a5c51 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-https.swap-origin.http.html
index 151d87662ab..f767e02e2f0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-http.keep-origin.http.html
index c186fa19693..0c2128b8c16 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-http.no-redirect.http.html
index d0c49af446f..56ba08f9a4b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-http.swap-origin.http.html
index 594be914a13..8d2bb23f435 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-https.keep-origin.http.html
index f0acef6c59e..b6ac13a2098 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-https.no-redirect.http.html
index 569f8c1ded6..9f2e599719c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-https.swap-origin.http.html
index c027bcd884d..8b940c905e9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/sharedworker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/sharedworker-classic/same-http.keep-origin.http.html
index 6e6160aa74a..1f4d8c219fe 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/sharedworker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/sharedworker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/sharedworker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/sharedworker-classic/same-http.no-redirect.http.html
index 03b0a5ecd0c..8cfd6e34217 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/sharedworker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/sharedworker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/worker-classic/same-http.keep-origin.http.html
index 9c1caa904e3..6fc428e4dd5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/worker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/worker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/worker-classic/same-http.no-redirect.http.html
index 954ed8fa62a..1609876cd6e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/worker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/worker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/worker-module/same-http.keep-origin.http.html
index dd8d5e58104..f1e900f684a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/worker-module/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/worker-module/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/worker-module/same-http.no-redirect.http.html
index 282912b7da4..ba6fe6d2e21 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/worker-module/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/worker-module/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-http.keep-origin.http.html
index 71192894cea..4b2c48698ac 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-http.no-redirect.http.html
index 60033300dd7..9a705257078 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-http.swap-origin.http.html
index be62704fe35..affed7867a0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-https.keep-origin.http.html
index 7d4131664e8..70893f732ee 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-https.no-redirect.http.html
index 84e65d398a1..b51c293adfa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-https.swap-origin.http.html
index 1b7e54f4ff6..242a50ca8ce 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-http.keep-origin.http.html
index 9f3d16e85d2..e48d5780d19 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-http.no-redirect.http.html
index 40cd238de98..2a116be0777 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-http.swap-origin.http.html
index a912773ca20..6dbf270a389 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-https.keep-origin.http.html
index b0eda9910fd..840f039a217 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-https.no-redirect.http.html
index ecfc6a58475..8a66808cf18 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-https.swap-origin.http.html
index c166e90808a..957da8954e7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html
index 66b6fe0b7a5..9155d66f626 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html
index 51dd83fc0d8..5c9c66f16d5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html
index c1e6a7f3012..0fef98fe67d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html
index f00deb68462..a25dc4bca74 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html
index fb61f41e54e..071225581fd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html
index 856a6ff338c..ad37e713876 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html
index 5770833861a..9a0f5015cee 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html
index 885af714433..a8459d5fb5f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html
index 36c1111776b..f2ddc795a21 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html
index a6419941f8e..9f1006aef87 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html
index be30b932ed4..183bb2d0264 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html
index b97708f7ecf..cca7a26a768 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html
index 01332cb58cd..bd9a2d5c70f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html
index 62443f00545..61855c8ae1c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html
index a409f58bdbd..adaed5b5837 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html
index 80f568bbec0..7f9baa95389 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html
index b56c1d08080..23b7d34dab0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html
index c2905e353b8..09f8edbac1d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html
index ef37a650f28..ef9d2149c5c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html
index 1dd564973cf..a2be318d79e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html
index 455f21a7191..2f948f14dfe 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html
index 3e18a014d0f..c0e668862ab 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html
index 1d18b76e328..3ab9e93757b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html
index e2ff9ac8b48..7c4c7efd405 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html
index 8a013ed39f6..d166e4f69c6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html
index 24018ebeaf2..a028e91e640 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html
index 1d85bec8222..357578781d3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html
index 6346b6628dd..aa633b2a9d9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/cross-http.keep-origin.http.html
index 6d20528d78b..e86c12f58cd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/cross-http.no-redirect.http.html
index d5d61b9fc03..88600b100b5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/cross-http.swap-origin.http.html
index bcc5b710ed2..df3bc910335 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/cross-https.keep-origin.http.html
index ce32dca4677..c9906db455d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/cross-https.no-redirect.http.html
index 1b25245c711..bd793aea924 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/cross-https.swap-origin.http.html
index b7966458616..1aa6c9228a6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/same-http.keep-origin.http.html
index 3fba161030d..0b62a4d6be9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/same-http.no-redirect.http.html
index 61ef726b827..c4e022b0db3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/same-http.swap-origin.http.html
index bcb47eae284..33dbd3f7bc0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/same-https.keep-origin.http.html
index 80f998207b3..cd721294d4e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/same-https.no-redirect.http.html
index 1fddd37aa73..d3e39b2b95e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/same-https.swap-origin.http.html
index 05c57e5182d..992381ccbbc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/worker-classic/same-http.keep-origin.http.html
index ac7046bb632..83e7f88061e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/worker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/worker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/worker-classic/same-http.no-redirect.http.html
index 7b9475d11f0..dcd9f19ae2e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/worker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/worker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/worker-module/same-http.keep-origin.http.html
index ca92181460a..921e110ea96 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/worker-module/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/worker-module/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/worker-module/same-http.no-redirect.http.html
index ab43f41d986..ea030d97f9d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/worker-module/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/worker-module/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/cross-http.keep-origin.http.html
index d7c2793cb10..31976ea3621 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/cross-http.no-redirect.http.html
index e5acd9251bb..cf42536b8f9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/cross-http.swap-origin.http.html
index e02c2cc1d7d..bc8e6e1c3c6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/cross-https.keep-origin.http.html
index 7b19f5ef084..ed7f08080a4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/cross-https.no-redirect.http.html
index da274023e02..1f3da4826b6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/cross-https.swap-origin.http.html
index d29c4099a70..d32552c8448 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/same-http.keep-origin.http.html
index aba84b4a854..a495c7fbc6c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/same-http.no-redirect.http.html
index e3a716d2eaa..3595e62cf81 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/same-http.swap-origin.http.html
index 64e3aacf939..5af824ea04b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/same-https.keep-origin.http.html
index 47ac8644c82..876fcbb2a2c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/same-https.no-redirect.http.html
index 9fa82acf6f9..472b8fe80d3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/same-https.swap-origin.http.html
index de5f54a16a6..1ec110cf94d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html
index 8729b063dd7..f8018f14ea0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html
index 51c30f5bdb6..3b168c302b9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html
index f2b7d748e98..014a32befff 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html
index aad980ddb23..466255e088d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html
index 3151188ff10..955da21b7b1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html
index 024c17fd303..bda42a55555 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/same-http.keep-origin.http.html
index 8d0d4033e3c..9cc5997d246 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/same-http.no-redirect.http.html
index 59bf06dce83..450f215c07e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/same-http.swap-origin.http.html
index 53987a6041a..724579258ae 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/same-https.keep-origin.http.html
index 25612bba917..15dc1ba046b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/same-https.no-redirect.http.html
index e9b8e78ea4f..3f7f91ff894 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/same-https.swap-origin.http.html
index 0e1c1f22813..24ed5b1838e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html
index c3e972ce8d7..f0ff87db9f3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html
index 425fcc2a6c3..323c47ec095 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html
index 485ac3f729f..9c45c78d89b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html
index 5f61a1ef72e..f4a20fe2050 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html
index c3b65435854..558d114bf0d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html
index 83f9788e2ba..7294a748b83 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html
index ffcbe9fa729..3aa1f93147c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html
index 59107ab6786..f6cb8e7ed78 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html
index a7c13f14058..3e5c7010ec0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html
index 130cdd6cdd6..a5f35f9e528 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/same-http.keep-origin.http.html
index 083c2d92917..c5f69765ad3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/same-http.no-redirect.http.html
index 60d2e5417ea..3878702db2d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/same-http.swap-origin.http.html
index 133c1109a41..802d3d8aa01 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/same-https.keep-origin.http.html
index 888fa14be5e..5c4627a5b40 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/same-https.no-redirect.http.html
index be0b8495792..1437d293002 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/same-https.swap-origin.http.html
index 14595f061dd..d9e178af18b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/cross-http.keep-origin.http.html
index c11ceb3c466..667b67a5a70 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/cross-http.no-redirect.http.html
index 76f970a4d1b..60041180049 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/cross-http.swap-origin.http.html
index d0ecd1bda69..c9908801142 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/cross-https.keep-origin.http.html
index 47d2257a14e..b7bb0e27d78 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/cross-https.no-redirect.http.html
index 3830dd1e6bc..024ce73fffd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/cross-https.swap-origin.http.html
index 6884a499b9d..92244ee1e26 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/same-http.keep-origin.http.html
index c3060ee9df4..e004df39262 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/same-http.no-redirect.http.html
index a1f0f836f2c..0796d9bd8e7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/same-http.swap-origin.http.html
index 80dd7c3ed5f..19523f159df 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/same-https.keep-origin.http.html
index 730e70e2dd4..87376d86665 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/same-https.no-redirect.http.html
index 0b8c67449a7..eee2bc0f23d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/same-https.swap-origin.http.html
index 545ee9085e6..dd846613a7c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/worker-classic/same-http.keep-origin.http.html
index 98759fedf7a..b483ea50529 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/worker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/worker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/worker-classic/same-http.no-redirect.http.html
index 98c0bf6f85c..740c4ef140d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/worker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/worker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/worker-module/same-http.keep-origin.http.html
index 295cc9765f3..950aee01cc5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/worker-module/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/worker-module/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/worker-module/same-http.no-redirect.http.html
index a811f6bce99..123a021cd10 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/worker-module/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/worker-module/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/cross-http.keep-origin.http.html
index 2cd5a5d742d..a9c1b279686 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/cross-http.no-redirect.http.html
index 7e1f552b897..a76d154cf48 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/cross-http.swap-origin.http.html
index be2cb91141b..27ac462e6a1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/cross-https.keep-origin.http.html
index 01b3d8135e7..61c12bd615f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/cross-https.no-redirect.http.html
index a3b408f1695..1b42718b941 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/cross-https.swap-origin.http.html
index e3f5f93bf72..e1a13c0cef8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/same-http.keep-origin.http.html
index 8301674414f..04778e6a7f9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/same-http.no-redirect.http.html
index 8933c42a45c..750c51d97a2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/same-http.swap-origin.http.html
index 125cbd6e68a..65b1102ed48 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/same-https.keep-origin.http.html
index 5a37ef3febe..b4a0c09da30 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/same-https.no-redirect.http.html
index 4eae1c35458..ebaf92063c3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/same-https.swap-origin.http.html
index 6fdeef3dfc9..6083f2e6ad2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/cross-http.keep-origin.http.html
index f84e7957dae..5710f505928 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/cross-http.no-redirect.http.html
index 2550130700f..8d77253a55d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/cross-http.swap-origin.http.html
index 263451885ef..ae40668002a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/cross-https.keep-origin.http.html
index b37d1750b28..1da453cad36 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/cross-https.no-redirect.http.html
index 854ec2f54e3..7910f640c84 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/cross-https.swap-origin.http.html
index 64d4f2031b3..ef71ae20e8b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/same-http.keep-origin.http.html
index 88963b3c21a..4421d9693a8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/same-http.no-redirect.http.html
index ae987334497..ed5b109dd2d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/same-http.swap-origin.http.html
index e95dd4ae449..5c76401879d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/same-https.swap-origin.http.html
index 641e702f0ad..4006d3a3b43 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-classic/same-http.keep-origin.http.html
index b6b9fb52e89..f47f7232e03 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-classic/same-http.no-redirect.http.html
index a1f8ac27306..8de6127a678 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-module/same-http.keep-origin.http.html
index f6ce3e0c929..c5755b19614 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-module/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-module/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-module/same-http.no-redirect.http.html
index 5d13e002539..a296ee2917b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-module/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-module/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/cross-http.keep-origin.http.html
index 3ad437db868..49cc1a4898c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/cross-http.no-redirect.http.html
index 33fcf846864..9c7d7eb7a1e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/cross-http.swap-origin.http.html
index 7676486094e..c466fe5beaf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/cross-https.keep-origin.http.html
index a81daf7ce19..6247edbabfd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/cross-https.no-redirect.http.html
index 962b71316e3..dd88f712a15 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/cross-https.swap-origin.http.html
index 363cbaa93d8..0c4395a1e7b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/same-http.keep-origin.http.html
index 7c147f23eb6..2d602531c83 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/same-http.no-redirect.http.html
index d37f669f217..f91fcc2a5c7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/same-http.swap-origin.http.html
index ec2fdbd14d8..40b8decd33d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/same-https.swap-origin.http.html
index a5cdb2c70fa..85be91bd8c4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html
index 765ede62e3d..04f379f21e5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html
index 684646f7831..7768727f457 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html
index eb5d6982d7f..b26c6cf6b5e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html
index b85e61b0312..0ae84da8e71 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html
index 41dc53d3a55..c4d8f9f9f75 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html
index 939ec199400..16396ba1c4c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html
index dde5deb9c43..1f652ed96e5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html
index c0de913d9c7..7ea765e772b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html
index ec17260f0ee..0c67b6c5f50 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html
index 7c659e7711b..adfc4ffb8ec 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html
index 9171ad57bfe..4a599c231ae 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html
index 5d1da1b64de..09857811f54 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html
index 0992af88c52..7684917966c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html
index 2b267e474ed..3af26b1bec2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html
index 5ce50b1a905..ffb9e111456 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html
index 979cfcd9f95..2a84f11c652 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html
index 4a59fb339ed..3c2c9f9a026 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html
index 45d520f5580..191391ab311 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html
index 8f155d3c142..027f55ea0c1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html
index c4a36aa3a9a..5933a804c63 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html
index 458079006c0..9cab9b588ca 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html
index 99742ad3815..638a75ae1cf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html
index d98173893ea..2d3fd299398 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html
index be8076df6bc..e5c97576ff5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html
index 55063e335f0..3d7ce707212 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html
index a164d3ca9fb..1e56cc4e1bb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html
index e9383d0a5a4..c057078c8d1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html
index 3b3459d2b44..738db2d64d7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/cross-http.keep-origin.http.html
index c791d7c6c90..3c4fb90d43e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/cross-http.no-redirect.http.html
index 948e77c2323..c5de37784a2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/cross-http.swap-origin.http.html
index dfc46bb9a02..65c20b010f8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/cross-https.keep-origin.http.html
index 45e35de3e6d..c073bf16f04 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/cross-https.no-redirect.http.html
index 959c1185ed0..98c60e9279a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/cross-https.swap-origin.http.html
index 943d9e9300d..fbf79f0c0d0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/same-http.keep-origin.http.html
index 7a07ea6f0cf..18d4d666c43 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/same-http.no-redirect.http.html
index 441378d3d9e..80ce51658e2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/same-http.swap-origin.http.html
index e370555b9c4..f594282df2a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/same-https.keep-origin.http.html
index 529f51178a3..ce992d7e1c1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/same-https.no-redirect.http.html
index 1f0a94076e6..884a0983e77 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/same-https.swap-origin.http.html
index 8a0b1e2d03e..f433eaeeaa6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/worker-classic/same-http.keep-origin.http.html
index a34370ba108..508ee25c824 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/worker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/worker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/worker-classic/same-http.no-redirect.http.html
index 9433fd397d2..f67f753460a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/worker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/worker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/worker-module/same-http.keep-origin.http.html
index 20fd1ce5099..fd6190ee513 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/worker-module/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/worker-module/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/worker-module/same-http.no-redirect.http.html
index e1bb290283f..cb6a39097b0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/worker-module/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/worker-module/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/cross-http.keep-origin.http.html
index 4ad132b120b..688ebe2503b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/cross-http.no-redirect.http.html
index d86f49f637c..9a07afdd3bc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/cross-http.swap-origin.http.html
index a341a0d6261..283eec4941b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/cross-https.keep-origin.http.html
index a78699124ed..5eac4de84f2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/cross-https.no-redirect.http.html
index 28c92ff3e63..ef0a65d1cd6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/cross-https.swap-origin.http.html
index 62df9999b40..9d78e4434f7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/same-http.keep-origin.http.html
index bc93d873258..721e69e6577 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/same-http.no-redirect.http.html
index ef8eca36465..cd0a701c5ef 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/same-http.swap-origin.http.html
index 94dbe390156..44afa347ad1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/same-https.keep-origin.http.html
index b6347dee39f..0dbe4788c4f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/same-https.no-redirect.http.html
index 69c9db4e2c6..38907838076 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/same-https.swap-origin.http.html
index b4ea52d9e6b..3490ec97737 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/cross-http.keep-origin.http.html
index 89ec238f6e8..44ebb43e805 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/cross-http.no-redirect.http.html
index 487db06f7e1..c1da7df08f2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/cross-http.swap-origin.http.html
index 52febb51fee..f68347b9600 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/cross-https.keep-origin.http.html
index 1a332054324..a996d9b6db1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/cross-https.no-redirect.http.html
index 9cda36a3a36..e8c55b6da90 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/cross-https.swap-origin.http.html
index c0686a0dd66..1bae6566373 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/same-http.keep-origin.http.html
index 001f13c4a59..e5cf65ef671 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/same-http.no-redirect.http.html
index 3e87e65f4ec..9a797213914 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/same-http.swap-origin.http.html
index 9c00a33dc37..46d7ebfbe64 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/same-https.keep-origin.http.html
index e61756c1143..6ec2a508d8c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/same-https.no-redirect.http.html
index 5d66b221d5b..b672a1ef975 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/same-https.swap-origin.http.html
index 1d3323cfcda..8f87bd9a9cb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-classic/same-http.keep-origin.http.html
index 23993354586..45454951082 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-classic/same-http.no-redirect.http.html
index 24487e57990..765bf8cd028 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-module/same-http.keep-origin.http.html
index 73f210cf6b6..de8e1c944af 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-module/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-module/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-module/same-http.no-redirect.http.html
index 3515661e1dd..c5183011029 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-module/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-module/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/cross-http.keep-origin.http.html
index 8752e769bb5..ffd46b81a46 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/cross-http.no-redirect.http.html
index c9f944a4d67..6b8bff53e84 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/cross-http.swap-origin.http.html
index 63a65114fca..43c5ea6227e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/cross-https.keep-origin.http.html
index 2525bc4edf0..5e349917a70 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/cross-https.no-redirect.http.html
index 0ba222a713b..2eaa6b0b30b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/cross-https.swap-origin.http.html
index d3ab30b3f8f..d3e0009d563 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/same-http.keep-origin.http.html
index ac870d795a3..62d3310f44c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/same-http.no-redirect.http.html
index a054d11232a..afa85368ea1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/same-http.swap-origin.http.html
index 83ed6ea49b9..20b64aae72c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/same-https.keep-origin.http.html
index abba4003a33..38ee3daf519 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/same-https.no-redirect.http.html
index c93f5faf837..7073cc96193 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/same-https.swap-origin.http.html
index e5ddfe102ed..3b9234a25ed 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/cross-http.keep-origin.http.html
index f87c439209d..96c42a63c89 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/cross-http.no-redirect.http.html
index 2e25529f337..57056d69c14 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/cross-http.swap-origin.http.html
index aa74648e670..f71edf30584 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/cross-https.keep-origin.http.html
index a8a0968a598..89c3cfa17cf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/cross-https.no-redirect.http.html
index 78e5de90add..b076b2164a7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/cross-https.swap-origin.http.html
index e3cb0f03e0f..9740934bc5f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/same-http.keep-origin.http.html
index 8c615d24d42..04d5dfb8caa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/same-http.no-redirect.http.html
index 5ef349eb5d4..edbf6e6a9ac 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/same-http.swap-origin.http.html
index 84e6b53cd2f..c84127d8cff 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/same-https.keep-origin.http.html
index 9721da9c58c..8ecf867adf3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/same-https.no-redirect.http.html
index 99ea34500ef..c0e540c6293 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/same-https.swap-origin.http.html
index 81fb2f573cb..f6177e7f8b2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/worker-classic/same-http.keep-origin.http.html
index ace5fcb03a3..07bb67b7db5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/worker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/worker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/worker-classic/same-http.no-redirect.http.html
index f6ad26085ef..48e9208a346 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/worker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/worker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/worker-module/same-http.keep-origin.http.html
index 7dff9a4a1cf..3ca8ef7b4b8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/worker-module/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/worker-module/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/worker-module/same-http.no-redirect.http.html
index d2f60a9aed3..05c95124008 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/worker-module/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/worker-module/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/cross-http.keep-origin.http.html
index 46ced07040f..f20c066df28 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/cross-http.no-redirect.http.html
index e1b9e68f435..1a8f13ea9f7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/cross-http.swap-origin.http.html
index 7da4e2c3f88..acb564d16e8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/cross-https.keep-origin.http.html
index 80c598e29d9..18d15bcf069 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/cross-https.no-redirect.http.html
index 595132c6aa7..0b5adda3d81 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/cross-https.swap-origin.http.html
index 37f034b327b..b1d04d2b49e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/same-http.keep-origin.http.html
index 19d4ef2430e..8ecd583ae94 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/same-http.no-redirect.http.html
index 98c4f7a1eb4..dd428f734ec 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/same-http.swap-origin.http.html
index 00d79fe8581..c34a62747b2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/same-https.keep-origin.http.html
index 7d7d06d83e4..99db6c438ae 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/same-https.no-redirect.http.html
index 7c71974147e..922174090b7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/same-https.swap-origin.http.html
index 6cf8f047e15..fcd2af596b0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html
index 818733c3296..b3ea18b9fb6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html
index 3dc64f40e06..7f6edc91be6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html
index 663d39d31f2..61b7268f9b3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html
index edcb9c2dae3..072d94f9e34 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html
index 788f96c8790..d8eceb33df5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html
index 46ad1a34c08..b329b3351a2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html
index 520b9fc73e9..fa23f721ae2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html
index 735926ab71e..30a0b8679b0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html
index 26f2ba7d581..aa407ccbe44 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html
index 8f814bad57f..7710fd83c17 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html
index cbd9e020b6d..f1d54a402bf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html
index a411ffc400c..0dc6271f34a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html
index a064bad0e50..2a87dc17257 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html
index cdbd2b055bd..292fdd1e8d1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html
index a7b653e2c76..ab959688664 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html
index 540059440bc..a5cba23dc80 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html
index ffa896147d7..add8b647fa0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html
index c18106c02f2..400756b999e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html
index d9b5ea9468f..42e16819495 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html
index c6fd0f10a5d..e9a77ebe70c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html
index 66f8ea95d8c..3e3810e1f73 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html
index c6e23f8507a..423b23862fd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html
index b6822c58e0d..17433da6149 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html
index 6ee9252103a..9cec405a2ae 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html
index ea57e8e319d..04d58fa287c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html
index edf7ef0c479..a3435a93131 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html
index 51c6ebbe347..ec006ea8fe3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html
index c75fa94e278..d9ba51a757c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/cross-http.keep-origin.http.html
index d6875a5e66d..611f331b735 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/cross-http.no-redirect.http.html
index a7a9256beac..d04e5019da1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/cross-http.swap-origin.http.html
index 2d8ae310368..193d0d7d9b5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/cross-https.keep-origin.http.html
index a62b8e83f7c..517274e7857 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/cross-https.no-redirect.http.html
index 6ba5d7586db..89f91632266 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/cross-https.swap-origin.http.html
index 54e03e817b3..15b057805a4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/same-http.keep-origin.http.html
index f72e8584686..82910461dd7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/same-http.no-redirect.http.html
index 9c2722ba8cc..67d5422be00 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/same-http.swap-origin.http.html
index 88e6e5817d4..d7e2dfba9f3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/same-https.keep-origin.http.html
index 373d60b5c27..bf181457325 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/same-https.no-redirect.http.html
index 3be6f3d7d54..bf48e758e1c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/same-https.swap-origin.http.html
index 9963495e1fa..e3ffc841db8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/worker-classic/same-http.keep-origin.http.html
index c0bbd9e80e1..d2edb3df422 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/worker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/worker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/worker-classic/same-http.no-redirect.http.html
index 710d8c9d831..ce3870f2463 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/worker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/worker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/worker-module/same-http.keep-origin.http.html
index 46a77fc0a09..23c0dfeb05e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/worker-module/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/worker-module/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/worker-module/same-http.no-redirect.http.html
index f7a98d21c22..c58ad5f2129 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/worker-module/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/worker-module/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/cross-http.keep-origin.http.html
index 7b0b513fa4a..82f55e05aad 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/cross-http.no-redirect.http.html
index a4383529eb9..d69ade0aafd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/cross-http.swap-origin.http.html
index e51a3084032..b0de7562969 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/cross-https.keep-origin.http.html
index ad2ce3f93e1..7d650f0063f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/cross-https.no-redirect.http.html
index 3885092582d..df7182c5d10 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/cross-https.swap-origin.http.html
index 48a868c082e..cb374d68712 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/same-http.keep-origin.http.html
index 2880de69536..f8404a25747 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/same-http.no-redirect.http.html
index 03b819fb3d1..6dc3647c053 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/same-http.swap-origin.http.html
index dd35c863635..173c27e96df 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/same-https.keep-origin.http.html
index 0b67779386b..4b3dd0fa3af 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/same-https.no-redirect.http.html
index c52972debad..1ce6da3d97c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/same-https.swap-origin.http.html
index 5ea2c27cec5..8cc3e20a88c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html
index 5156daea69a..ab119e2dc46 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html
index f9094521934..084097e7260 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html
index c99cb5b5bab..b9b4829ac78 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html
index e063175993b..7aff19a1169 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html
index 32008cca880..86bc9d2ae05 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html
index 668e35619e2..2f0325f0377 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/same-http.keep-origin.http.html
index 227b5137430..7c01039414e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/same-http.no-redirect.http.html
index aad87e78565..f1a8981a37c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/same-http.swap-origin.http.html
index 520522a066c..058f6cc6ca0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/same-https.keep-origin.http.html
index 8e1c6e61d4c..8eac07f576e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/same-https.no-redirect.http.html
index 13ef33f29e2..ad64aaa90f9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/same-https.swap-origin.http.html
index 5234b75b68c..0e7e7a8942b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html
index 53895882f62..be009048917 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html
index 2a7fde0f23e..42837199b74 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html
index ad13fbe59fa..acddfc44bd2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html
index c67005d2d44..192ea475881 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html
index c85d240a123..cedfee0933b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html
index 5c09631e9a9..81c14463c9a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html
index eedc489caf5..ae67981efe2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html
index 5bb6cb6f07c..e5146301f3a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html
index bb391df01c4..8b33dfc9995 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html
index 6201cfc00da..75e60476ab8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/same-http.keep-origin.http.html
index c1168e1e0c3..442ea6e0317 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/same-http.no-redirect.http.html
index dcd18e9c90f..a96bb634c2c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/same-http.swap-origin.http.html
index 947e464ca12..b7311f60dc9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/same-https.keep-origin.http.html
index 58499fdf503..c08aa615fb8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/same-https.no-redirect.http.html
index 6a8b94b7e82..abbafe39c3c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/same-https.swap-origin.http.html
index 761e2114217..8bed094121e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/cross-http.keep-origin.http.html
index da5ab1d009d..48ace14fc02 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/cross-http.no-redirect.http.html
index 5ea18611299..eea1c9d23ef 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/cross-http.swap-origin.http.html
index e98531f3ea6..1ac01f95cf5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/cross-https.keep-origin.http.html
index 7cdfdf01e3a..72ffa499ba2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/cross-https.no-redirect.http.html
index 3e829995a21..4cc4e6aee0b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/cross-https.swap-origin.http.html
index 82cdb9e1f7a..20aab6e89cc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/same-http.keep-origin.http.html
index 83b5aa77252..730161ba658 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/same-http.no-redirect.http.html
index 0e10655f574..06900b943d1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/same-http.swap-origin.http.html
index 626ec6f8d34..3bd3ffff584 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/same-https.keep-origin.http.html
index 1d335535711..03342b57f7d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/same-https.no-redirect.http.html
index b14a0eb62b5..0b953699d93 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/same-https.swap-origin.http.html
index 3479de230fa..fa7bcb6b79c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/worker-classic/same-http.keep-origin.http.html
index 5f8779f15d5..c68a11182bb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/worker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/worker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/worker-classic/same-http.no-redirect.http.html
index 1efca23c97e..35c7d724cba 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/worker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/worker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/worker-module/same-http.keep-origin.http.html
index c5509188f5e..639239a96c2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/worker-module/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/worker-module/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/worker-module/same-http.no-redirect.http.html
index 2e6db609485..cafc59adfbb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/worker-module/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/worker-module/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/cross-http.keep-origin.http.html
index cb85c95cf7d..b3520eb171d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/cross-http.no-redirect.http.html
index c0fc6ecb12a..60cc2cc6873 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/cross-http.swap-origin.http.html
index a76d66e002e..df80d9d3655 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/cross-https.keep-origin.http.html
index 7cfdfdd2f7b..dc270ea2b45 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/cross-https.no-redirect.http.html
index d7312ca7109..ac7521db709 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/cross-https.swap-origin.http.html
index 72625cf7569..a51a6d6d2b4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/same-http.keep-origin.http.html
index d918d1cbd9f..ee10efe2898 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/same-http.no-redirect.http.html
index b72a394a20e..3e735529770 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/same-http.swap-origin.http.html
index 3a9a57d2780..e57c29dcffb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/same-https.keep-origin.http.html
index 752fd6fdbee..10db4cb622c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/same-https.no-redirect.http.html
index 0d926198d62..e065fd47504 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/same-https.swap-origin.http.html
index 9c6df197638..7b9230b38c0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch/cross-http.keep-origin.http.html
index fe46bfb18db..c7631351ba3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch/cross-http.no-redirect.http.html
index 941e3cfbad0..6014e39af6f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch/cross-http.swap-origin.http.html
index d835bb8a8c1..cba952c299c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch/cross-https.keep-origin.http.html
index ce3cc478c3a..b896713e991 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch/cross-https.no-redirect.http.html
index 970aa8a8f9d..9a20a5fe2da 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch/cross-https.swap-origin.http.html
index ef337b74530..2beb5b804f6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch/same-http.keep-origin.http.html
index 3c45ca857b2..f525d19e585 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch/same-http.no-redirect.http.html
index 23932cd7bed..a9f0e1b6c65 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch/same-http.swap-origin.http.html
index 88df9f92e3b..af2f6542d69 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch/same-https.swap-origin.http.html
index e275575f1f8..9f46518e720 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/worker-classic/same-http.keep-origin.http.html
index ca664f3c249..fa7957328af 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/worker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/worker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/worker-classic/same-http.no-redirect.http.html
index fc3f79d68df..61180bb3d6d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/worker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/worker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/worker-module/same-http.keep-origin.http.html
index c9ea722bf5f..95f6c8ebd80 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/worker-module/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/worker-module/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/worker-module/same-http.no-redirect.http.html
index 75ce7b9c59d..49db7eb0bb2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/worker-module/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/worker-module/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr/cross-http.keep-origin.http.html
index 3fc0180ce25..c9a0fb20d31 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr/cross-http.no-redirect.http.html
index f18afa664c5..7550a8ccab6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr/cross-http.swap-origin.http.html
index dfb4cfb7f3d..d2d8b946ea8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr/cross-https.keep-origin.http.html
index f0256941b62..7a688a209dd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr/cross-https.no-redirect.http.html
index 2d0a8017ce0..821792a1d22 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr/cross-https.swap-origin.http.html
index 8bfc669a2e1..31a2bab7b0f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr/same-http.keep-origin.http.html
index ffbaeca3703..0ba5aa4e567 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr/same-http.no-redirect.http.html
index 33df3bbcfdf..6f3365748ea 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr/same-http.swap-origin.http.html
index 9e46cc2f040..b7f11716e55 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr/same-https.swap-origin.http.html
index 2b5b44f73e8..5f02b6f5027 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html
index 90d1b34b76e..f481d9f5a21 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html
index 5f0d0c14a7c..248560aeb3c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html
index d1e08efe193..64b579b819b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html
index 7b35037645f..9e314756d38 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html
index b9fcad92b60..e0262303040 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html
index 3a064f0e609..ce01de639fc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html
index 622c3105e74..5fbd8a56376 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html
index 456470ba3b9..bccb924537c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html
index 016a7e351cf..6dfd5d33c26 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html
index 11b8af7d62a..3394b87c727 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html
index 478a6e9cc3a..efe8f5e6470 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html
index 4a20ba61ba8..849670a060f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html
index 05ce6164fa6..7a9386a684f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html
index 99935de7cf9..cbbe55e8222 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html
index 1f995a6f45f..27ed0b5ec84 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html
index 5a010ce546b..f44d5344c5c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html
index 882ad4831b3..91e470231a4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html
index 641d43fcc9b..549821f7512 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html
index 243de3eb4fa..79f79f56d01 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html
index 6e880206eb2..9fda252bd4b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html
index eb8d89951ff..9dc86ffefb4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html
index 4a65e04cb47..1507b217f9b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html
index 4839c083a3d..74345f2c6f9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html
index 5a06b7289e5..fa3be90d671 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html
index db5e0c7d82e..9a60398d684 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html
index 38bfcabc3ff..aa51156c0f9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html
index a5fe5b441cf..a853214df4e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html
index 2312589b7e5..1d732252e5e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/cross-http.keep-origin.http.html
index d82eba968f3..7a178fb5cef 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/cross-http.no-redirect.http.html
index 89206428d25..6946b07bd34 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/cross-http.swap-origin.http.html
index d1155320397..fa449166850 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/cross-https.keep-origin.http.html
index 4bc5fe6e0e6..bb496473158 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/cross-https.no-redirect.http.html
index 515fbfb12b4..2b149337164 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/cross-https.swap-origin.http.html
index c7db5997b9f..fd507dc25ac 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/same-http.keep-origin.http.html
index a1244441281..9531148cb4b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/same-http.no-redirect.http.html
index 9fa6617e519..7af0965bbcf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/same-http.swap-origin.http.html
index 1b4961d3392..c96bca8e16a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/same-https.keep-origin.http.html
index 18f675a3be0..4ab84415003 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/same-https.no-redirect.http.html
index 6c9e78f3014..41d41915267 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/same-https.swap-origin.http.html
index b7d28caafb3..00c48f59896 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/worker-classic/same-http.keep-origin.http.html
index 215b3edf4f8..963e40df49c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/worker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/worker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/worker-classic/same-http.no-redirect.http.html
index 64733a5f5a7..732985bc4cc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/worker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/worker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/worker-module/same-http.keep-origin.http.html
index b39461bc683..88bbfe1bc16 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/worker-module/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/worker-module/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/worker-module/same-http.no-redirect.http.html
index 4031424d337..88724a6a8b1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/worker-module/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/worker-module/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/cross-http.keep-origin.http.html
index 412fe07e574..8e83ead6878 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/cross-http.no-redirect.http.html
index 18749d4289a..884a0be11e0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/cross-http.swap-origin.http.html
index d09d298f9bb..1729cafecf9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/cross-https.keep-origin.http.html
index 238f77d1178..6bfcb3e7be7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/cross-https.no-redirect.http.html
index 64e5c9a2cc5..c3a62d2215d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/cross-https.swap-origin.http.html
index 1d95b2aa34d..63b71ac7753 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/same-http.keep-origin.http.html
index 403f3e938ee..ed558957b4e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/same-http.no-redirect.http.html
index 191179ab804..3334ff974ec 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/same-http.swap-origin.http.html
index 14e4f635acb..c4f9cb93c5e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/same-https.keep-origin.http.html
index 5074805d3dd..b7c897fdaf5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/same-https.no-redirect.http.html
index 7562c4417d8..fdf56bbbfce 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/same-https.swap-origin.http.html
index 2fc3c9724d7..220f73a75b0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/cross-http.keep-origin.http.html
index 955369ec7bb..e90b237a347 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/cross-http.no-redirect.http.html
index b5f3302a03a..60a64641423 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/cross-http.swap-origin.http.html
index 7d56f9f8b38..1ef98030197 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/cross-https.keep-origin.http.html
index 04c561d613e..be7bee7fe28 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/cross-https.no-redirect.http.html
index 0edb354842e..7cd678646a7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/cross-https.swap-origin.http.html
index 6312f93a211..f3e5ddf1866 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/same-http.keep-origin.http.html
index c92d12158c2..161c346d977 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/same-http.no-redirect.http.html
index eaea95ad6a3..79675b86528 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/same-http.swap-origin.http.html
index f065e43adad..0c0ad4f1dfa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/same-https.keep-origin.http.html
index 29c645149b9..5624607190b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/same-https.no-redirect.http.html
index fcb96b869be..54e79c9f453 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/same-https.swap-origin.http.html
index e918da49e6d..74be6bef4d3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/worker-classic/same-http.keep-origin.http.html
index acbf9e02eda..5f667ba8d5e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/worker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/worker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/worker-classic/same-http.no-redirect.http.html
index 7824eb443fa..3bc18ea783f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/worker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/worker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/worker-module/same-http.keep-origin.http.html
index 6940fbf9317..907d1553b0d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/worker-module/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/worker-module/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/worker-module/same-http.no-redirect.http.html
index e968ee812ee..8280d61f39f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/worker-module/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/worker-module/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/cross-http.keep-origin.http.html
index a74f146f721..c84efa19a9a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/cross-http.no-redirect.http.html
index 636696bbd8a..080d448771a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/cross-http.swap-origin.http.html
index 53fb44d2a8b..dbe7659d870 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/cross-https.keep-origin.http.html
index 2fa9a68e110..1d92d6de03d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/cross-https.no-redirect.http.html
index a9d158ea3eb..d11b4ee5f60 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/cross-https.swap-origin.http.html
index 24deef5b129..f4116fd9d12 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/same-http.keep-origin.http.html
index 27f58ab50bc..d550e1ce40c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/same-http.no-redirect.http.html
index 2d5b9e2199c..f2d8e8cf3d5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/same-http.swap-origin.http.html
index d90adec850c..8b2ee729768 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/same-https.keep-origin.http.html
index 7d219765d86..9590e6af037 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/same-https.no-redirect.http.html
index 0ddc6b11b9a..731349ba25f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/same-https.swap-origin.http.html
index 50926c70bfb..15dfe031eef 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/cross-http.keep-origin.http.html
index f341ec99e52..ac262b509c0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/cross-http.no-redirect.http.html
index 760bf977119..d56b994ae57 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/cross-http.swap-origin.http.html
index 43023a21938..ed3d3d18815 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/cross-https.keep-origin.http.html
index d854190b5b1..d0de32d414b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/cross-https.no-redirect.http.html
index 210fb465dc8..ce96aacd3e2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/cross-https.swap-origin.http.html
index e19fb082d64..f641586fda4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/same-http.keep-origin.http.html
index 9365ed50ac1..da106961a25 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/same-http.no-redirect.http.html
index ea8a0130c68..ae97e66b28e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/same-http.swap-origin.http.html
index 17122d38f52..dc8420c8322 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/same-https.keep-origin.http.html
index 99fe3242388..e35002aa93f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/same-https.no-redirect.http.html
index ce0bce54fbe..d0aef00b0b8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/same-https.swap-origin.http.html
index b51a46c4835..d659b2e417a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/worker-classic/same-http.keep-origin.http.html
index f2266188fe9..320c613e2c7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/worker-classic/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/worker-classic/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/worker-classic/same-http.no-redirect.http.html
index 3eac1bfb889..95d7966ff08 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/worker-classic/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/worker-classic/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/worker-module/same-http.keep-origin.http.html
index a7422bf0f9c..9a7435fb0eb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/worker-module/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/worker-module/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/worker-module/same-http.no-redirect.http.html
index fd43de26560..60a84c0c237 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/worker-module/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/worker-module/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/cross-http.keep-origin.http.html
index 47b181de913..80913252f5b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/cross-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/cross-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/cross-http.no-redirect.http.html
index 3b22ea6a5d5..036fd597f48 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/cross-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/cross-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/cross-http.swap-origin.http.html
index 9cc882e3b3b..c8d4fc0c48f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/cross-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/cross-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/cross-https.keep-origin.http.html
index 4bbe1d76152..e9643395ab3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/cross-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/cross-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/cross-https.no-redirect.http.html
index e2208cba1ce..faae5d5928e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/cross-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/cross-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/cross-https.swap-origin.http.html
index dc7c389d0cf..e9bb2395477 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/cross-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/cross-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/same-http.keep-origin.http.html
index d7797a75e29..07a3e6ede15 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/same-http.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/same-http.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/same-http.no-redirect.http.html
index 350cbe30a0b..95fdd6ae78d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/same-http.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/same-http.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/same-http.swap-origin.http.html
index b4b372508ed..e960815b069 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/same-http.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/same-http.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/same-https.keep-origin.http.html
index 47951e9b729..ab316a05de7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/same-https.keep-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/same-https.keep-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/same-https.no-redirect.http.html
index 46d85b141d3..77dde1a8902 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/same-https.no-redirect.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/same-https.no-redirect.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/same-https.swap-origin.http.html
index 57a3e7c5d8d..6258675a17c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/same-https.swap-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr/same-https.swap-origin.http.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
 <html>
   <head>
     <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/spec_json.js b/tests/wpt/web-platform-tests/referrer-policy/generic/spec_json.js
index cad5e79f1f8..27961c5de5c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/spec_json.js
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/spec_json.js
@@ -1 +1 @@
-var SPEC_JSON = {"subresource_schema": {"supported_delivery_type": {"img-tag": ["attr"], "sharedworker-classic": [], "xhr": [], "a-tag": ["attr", "rel-noref"], "area-tag": ["attr"], "iframe-tag": ["attr"], "worker-module": [], "script-tag": ["attr"], "fetch": [], "worker-classic": []}}, "source_context_list_schema": {"srcdoc-inherit": {"subresourcePolicyDeliveries": [], "description": "srcdoc iframe should inherit parent Document's policy", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "srcdoc"}]}, "worker-module": {"subresourcePolicyDeliveries": [], "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}, {"sourceContextType": "worker-module", "policyDeliveries": ["policy"]}]}, "worker-module-data": {"subresourcePolicyDeliveries": [], "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}, {"sourceContextType": "worker-module-data", "policyDeliveries": ["policy"]}]}, "worker-classic-data": {"subresourcePolicyDeliveries": [], "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}, {"sourceContextType": "worker-classic-data", "policyDeliveries": ["policy"]}]}, "top": {"subresourcePolicyDeliveries": [], "description": "Policy set by the top-level Document", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}]}, "req": {"subresourcePolicyDeliveries": ["nonNullPolicy"], "description": "Subresource request's policy should override Document's policy", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}]}, "worker-classic": {"subresourcePolicyDeliveries": [], "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}, {"sourceContextType": "worker-classic", "policyDeliveries": ["policy"]}]}, "iframe": {"subresourcePolicyDeliveries": [], "description": "external iframe's policy should override parent Document's policy", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}, {"sourceContextType": "iframe", "policyDeliveries": ["policy"]}]}, "srcdoc": {"subresourcePolicyDeliveries": [], "description": "srcdoc iframe's policy should override parent Document's policy", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}, {"sourceContextType": "srcdoc", "policyDeliveries": ["nonNullPolicy"]}]}}, "test_page_title_template": "Referrer-Policy: %(title)s", "test_expansion_schema": {"delivery_value": [null, "no-referrer", "no-referrer-when-downgrade", "same-origin", "origin", "origin-when-cross-origin", "strict-origin", "strict-origin-when-cross-origin", "unsafe-url"], "origin": ["same-http", "same-https", "cross-http", "cross-https"], "delivery_type": ["attr", "rel-noref", "http-rp", "meta"], "subresource": ["iframe-tag", "img-tag", "script-tag", "a-tag", "area-tag", "xhr", "worker-classic", "worker-module", "sharedworker-classic", "fetch"], "expectation": ["omitted", "origin", "stripped-referrer"], "expansion": ["default", "override"], "redirection": ["no-redirect", "keep-origin", "swap-origin"], "source_context_list": ["top", "req", "srcdoc-inherit", "srcdoc", "iframe", "worker-classic", "worker-classic-data", "worker-module", "worker-module-data"], "source_scheme": ["http", "https"]}, "selection_pattern": "%(source_context_list)s.%(delivery_type)s/%(delivery_value)s/%(subresource)s/%(origin)s.%(redirection)s.%(source_scheme)s", "specification": [{"test_expansion": [{"delivery_value": null, "origin": ["same-http", "cross-http"], "delivery_type": "*", "name": "insecure-protocol", "expectation": "stripped-referrer", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "http", "subresource": "*"}, {"delivery_value": null, "origin": ["same-https", "cross-https"], "delivery_type": "*", "name": "upgrade-protocol", "expectation": "stripped-referrer", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "http", "subresource": "*"}, {"delivery_value": null, "origin": ["same-http", "cross-http"], "delivery_type": "*", "name": "downgrade-protocol", "expectation": "omitted", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "https", "subresource": "*"}, {"delivery_value": null, "origin": ["same-https", "cross-https"], "delivery_type": "*", "name": "secure-protocol", "expectation": "stripped-referrer", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "https", "subresource": "*"}], "description": "Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.", "specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policies", "name": "unset-referrer-policy", "title": "Referrer Policy is not explicitly defined"}, {"test_expansion": [{"delivery_value": "no-referrer", "origin": "*", "delivery_type": "*", "name": "generic", "expectation": "omitted", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "*", "subresource": "*"}], "description": "Check that sub-resource never gets the referrer URL.", "specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer", "name": "no-referrer", "title": "Referrer Policy is set to 'no-referrer'"}, {"test_expansion": [{"delivery_value": "no-referrer-when-downgrade", "origin": ["same-http", "cross-http"], "delivery_type": "*", "name": "insecure-protocol", "expectation": "stripped-referrer", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "http", "subresource": "*"}, {"delivery_value": "no-referrer-when-downgrade", "origin": ["same-https", "cross-https"], "delivery_type": "*", "name": "upgrade-protocol", "expectation": "stripped-referrer", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "http", "subresource": "*"}, {"delivery_value": "no-referrer-when-downgrade", "origin": ["same-http", "cross-http"], "delivery_type": "*", "name": "downgrade-protocol", "expectation": "omitted", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "https", "subresource": "*"}, {"delivery_value": "no-referrer-when-downgrade", "origin": ["same-https", "cross-https"], "delivery_type": "*", "name": "secure-protocol", "expectation": "stripped-referrer", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "https", "subresource": "*"}], "description": "Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.", "specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade", "name": "no-referrer-when-downgrade", "title": "Referrer Policy is set to 'no-referrer-when-downgrade'"}, {"test_expansion": [{"delivery_value": "origin", "origin": "*", "delivery_type": "*", "name": "generic", "expectation": "origin", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "*", "subresource": "*"}], "description": "Check that all subresources in all casses get only the origin portion of the referrer URL.", "specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin", "name": "origin", "title": "Referrer Policy is set to 'origin'"}, {"test_expansion": [{"delivery_value": "same-origin", "origin": "same-http", "delivery_type": "*", "name": "same-origin-insecure", "expectation": "stripped-referrer", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "http", "subresource": "*"}, {"delivery_value": "same-origin", "origin": "same-https", "delivery_type": "*", "name": "same-origin-secure-default", "expectation": "stripped-referrer", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "https", "subresource": "*"}, {"delivery_value": "same-origin", "origin": ["same-http", "same-https"], "delivery_type": "*", "name": "same-origin-insecure", "expectation": "omitted", "expansion": "override", "redirection": "swap-origin", "source_context_list": "*", "source_scheme": "*", "subresource": "*"}, {"delivery_value": "same-origin", "origin": ["cross-http", "cross-https"], "delivery_type": "*", "name": "cross-origin", "expectation": "omitted", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "*", "subresource": "*"}], "description": "Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.", "specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin", "name": "same-origin", "title": "Referrer Policy is set to 'same-origin'"}, {"test_expansion": [{"delivery_value": "origin-when-cross-origin", "origin": "same-http", "delivery_type": "*", "name": "same-origin-insecure", "expectation": "stripped-referrer", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "http", "subresource": "*"}, {"delivery_value": "origin-when-cross-origin", "origin": "same-https", "delivery_type": "*", "name": "same-origin-secure-default", "expectation": "stripped-referrer", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "https", "subresource": "*"}, {"delivery_value": "origin-when-cross-origin", "origin": "same-https", "delivery_type": "*", "name": "same-origin-upgrade", "expectation": "origin", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "http", "subresource": "*"}, {"delivery_value": "origin-when-cross-origin", "origin": "same-http", "delivery_type": "*", "name": "same-origin-downgrade", "expectation": "origin", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "https", "subresource": "*"}, {"delivery_value": "origin-when-cross-origin", "origin": ["same-http", "same-https"], "delivery_type": "*", "name": "same-origin-insecure", "expectation": "origin", "expansion": "override", "redirection": "swap-origin", "source_context_list": "*", "source_scheme": "*", "subresource": "*"}, {"delivery_value": "origin-when-cross-origin", "origin": ["cross-http", "cross-https"], "delivery_type": "*", "name": "cross-origin", "expectation": "origin", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "*", "subresource": "*"}], "description": "Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.", "specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin", "name": "origin-when-cross-origin", "title": "Referrer Policy is set to 'origin-when-cross-origin'"}, {"test_expansion": [{"delivery_value": "strict-origin", "origin": ["same-http", "cross-http"], "delivery_type": "*", "name": "insecure-protocol", "expectation": "origin", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "http", "subresource": "*"}, {"delivery_value": "strict-origin", "origin": ["same-https", "cross-https"], "delivery_type": "*", "name": "upgrade-protocol", "expectation": "origin", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "http", "subresource": "*"}, {"delivery_value": "strict-origin", "origin": ["same-http", "cross-http"], "delivery_type": "*", "name": "downgrade-protocol", "expectation": "omitted", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "https", "subresource": "*"}, {"delivery_value": "strict-origin", "origin": ["same-https", "cross-https"], "delivery_type": "*", "name": "secure-protocol", "expectation": "origin", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "https", "subresource": "*"}], "description": "Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.", "specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin", "name": "strict-origin", "title": "Referrer Policy is set to 'strict-origin'"}, {"test_expansion": [{"delivery_value": "strict-origin-when-cross-origin", "origin": "same-http", "delivery_type": "*", "name": "same-insecure", "expectation": "stripped-referrer", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "http", "subresource": "*"}, {"delivery_value": "strict-origin-when-cross-origin", "origin": "same-http", "delivery_type": "*", "name": "same-insecure", "expectation": "origin", "expansion": "override", "redirection": "swap-origin", "source_context_list": "*", "source_scheme": "http", "subresource": "*"}, {"delivery_value": "strict-origin-when-cross-origin", "origin": "cross-http", "delivery_type": "*", "name": "cross-insecure", "expectation": "origin", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "http", "subresource": "*"}, {"delivery_value": "strict-origin-when-cross-origin", "origin": ["same-https", "cross-https"], "delivery_type": "*", "name": "upgrade-protocol", "expectation": "origin", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "http", "subresource": "*"}, {"delivery_value": "strict-origin-when-cross-origin", "origin": ["same-http", "cross-http"], "delivery_type": "*", "name": "downgrade-protocol", "expectation": "omitted", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "https", "subresource": "*"}, {"delivery_value": "strict-origin-when-cross-origin", "origin": "same-https", "delivery_type": "*", "name": "same-secure", "expectation": "stripped-referrer", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "https", "subresource": "*"}, {"delivery_value": "strict-origin-when-cross-origin", "origin": "same-https", "delivery_type": "*", "name": "same-secure", "expectation": "origin", "expansion": "override", "redirection": "swap-origin", "source_context_list": "*", "source_scheme": "https", "subresource": "*"}, {"delivery_value": "strict-origin-when-cross-origin", "origin": "cross-https", "delivery_type": "*", "name": "cross-secure", "expectation": "origin", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "https", "subresource": "*"}], "description": "Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.", "specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin", "name": "strict-origin-when-cross-origin", "title": "Referrer Policy is set to 'strict-origin-when-cross-origin'"}, {"test_expansion": [{"delivery_value": "unsafe-url", "origin": "*", "delivery_type": "*", "name": "generic", "expectation": "stripped-referrer", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "*", "subresource": "*"}], "description": "Check that all sub-resources get the stripped referrer URL.", "specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url", "name": "unsafe-url", "title": "Referrer Policy is set to 'unsafe-url'"}], "test_file_path_pattern": "gen/%(source_context_list)s.%(delivery_type)s/%(delivery_value)s/%(subresource)s/%(origin)s.%(redirection)s.%(source_scheme)s.html", "excluded_tests": [{"delivery_value": "*", "origin": ["cross-http", "cross-https"], "delivery_type": "*", "name": "cross-origin-workers", "expectation": "*", "expansion": "*", "redirection": "*", "source_context_list": "*", "source_scheme": "*", "subresource": ["worker-classic", "worker-module", "sharedworker-classic"]}, {"delivery_value": "*", "origin": ["same-https", "cross-https"], "delivery_type": "*", "name": "upgraded-protocol-workers", "expectation": "*", "expansion": "*", "redirection": "*", "source_context_list": "*", "source_scheme": "http", "subresource": ["worker-classic", "worker-module", "sharedworker-classic"]}, {"delivery_value": "*", "origin": ["same-http", "cross-http"], "delivery_type": "*", "name": "mixed-content-insecure-subresources", "expectation": "*", "expansion": "*", "redirection": "*", "source_context_list": "*", "source_scheme": "https", "subresource": "*"}, {"delivery_value": "*", "origin": "*", "delivery_type": "*", "name": "area-tag", "expectation": "*", "expansion": "*", "redirection": "*", "source_context_list": "*", "source_scheme": "*", "subresource": "area-tag"}, {"delivery_value": "*", "origin": "*", "delivery_type": "*", "name": "worker-requests-with-swap-origin-redirect", "expectation": "*", "expansion": "*", "redirection": "swap-origin", "source_context_list": "*", "source_scheme": "*", "subresource": ["worker-classic", "worker-module", "sharedworker-classic"]}, {"delivery_value": "*", "origin": "*", "delivery_type": "*", "name": "overhead-for-redirection", "expectation": "*", "expansion": "*", "redirection": ["keep-origin", "swap-origin"], "source_context_list": "*", "source_scheme": "*", "subresource": ["a-tag", "area-tag"]}, {"delivery_value": "*", "origin": "*", "delivery_type": "*", "name": "source-https-unsupported-by-web-platform-tests-runners", "expectation": "*", "expansion": "*", "redirection": "*", "source_context_list": "*", "source_scheme": "https", "subresource": "*"}, {"delivery_value": [null, "no-referrer-when-downgrade", "same-origin", "origin", "origin-when-cross-origin", "strict-origin", "strict-origin-when-cross-origin", "unsafe-url"], "origin": "*", "delivery_type": "rel-noref", "name": "<link rel=noreferrer>'s delivery_value should be no-referrer", "expectation": "*", "expansion": "*", "redirection": "*", "source_context_list": "*", "source_scheme": "*", "subresource": "*"}], "delivery_key": "referrerPolicy", "test_description_template": "Referrer Policy: Expects %(expectation)s for %(subresource)s to %(origin)s origin and %(redirection)s redirection from %(source_scheme)s context.", "source_context_schema": {"supported_delivery_type": {"iframe": ["meta", "http-rp"], "worker-module-data": [], "worker-classic-data": [], "top": ["meta", "http-rp"], "worker-classic": ["http-rp"], "iframe-blank": ["meta"], "worker-module": ["http-rp"], "srcdoc": ["meta"]}, "supported_subresource": {"iframe": "*", "worker-module-data": ["xhr", "fetch"], "worker-classic-data": ["xhr", "fetch"], "top": "*", "worker-classic": ["xhr", "fetch", "worker-classic", "worker-module"], "iframe-blank": "*", "worker-module": ["xhr", "fetch", "worker-classic", "worker-module"], "srcdoc": "*"}}};
+var SPEC_JSON = {"selection_pattern": "%(source_context_list)s.%(delivery_type)s/%(delivery_value)s/%(subresource)s/%(origin)s.%(redirection)s.%(source_scheme)s", "test_file_path_pattern": "gen/%(source_context_list)s.%(delivery_type)s/%(delivery_value)s/%(subresource)s/%(origin)s.%(redirection)s.%(source_scheme)s.html", "test_description_template": "Referrer Policy: Expects %(expectation)s for %(subresource)s to %(origin)s origin and %(redirection)s redirection from %(source_scheme)s context.", "test_page_title_template": "Referrer-Policy: %(title)s", "specification": [{"name": "unset-referrer-policy", "title": "Referrer Policy is not explicitly defined", "description": "Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.", "specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policies", "test_expansion": [{"name": "insecure-protocol", "expansion": "default", "source_scheme": "http", "source_context_list": "*", "delivery_type": "*", "delivery_value": null, "redirection": "*", "origin": ["same-http", "cross-http"], "subresource": "*", "expectation": "stripped-referrer"}, {"name": "upgrade-protocol", "expansion": "default", "source_scheme": "http", "source_context_list": "*", "delivery_type": "*", "delivery_value": null, "redirection": "*", "origin": ["same-https", "cross-https"], "subresource": "*", "expectation": "stripped-referrer"}, {"name": "downgrade-protocol", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": null, "redirection": "*", "origin": ["same-http", "cross-http"], "subresource": "*", "expectation": "omitted"}, {"name": "secure-protocol", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": null, "redirection": "*", "origin": ["same-https", "cross-https"], "subresource": "*", "expectation": "stripped-referrer"}]}, {"name": "no-referrer", "title": "Referrer Policy is set to 'no-referrer'", "description": "Check that sub-resource never gets the referrer URL.", "specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer", "test_expansion": [{"name": "generic", "expansion": "default", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "no-referrer", "redirection": "*", "origin": "*", "subresource": "*", "expectation": "omitted"}]}, {"name": "no-referrer-when-downgrade", "title": "Referrer Policy is set to 'no-referrer-when-downgrade'", "description": "Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.", "specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade", "test_expansion": [{"name": "insecure-protocol", "expansion": "default", "source_scheme": "http", "source_context_list": "*", "delivery_type": "*", "delivery_value": "no-referrer-when-downgrade", "redirection": "*", "origin": ["same-http", "cross-http"], "subresource": "*", "expectation": "stripped-referrer"}, {"name": "upgrade-protocol", "expansion": "default", "source_scheme": "http", "source_context_list": "*", "delivery_type": "*", "delivery_value": "no-referrer-when-downgrade", "redirection": "*", "origin": ["same-https", "cross-https"], "subresource": "*", "expectation": "stripped-referrer"}, {"name": "downgrade-protocol", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": "no-referrer-when-downgrade", "redirection": "*", "origin": ["same-http", "cross-http"], "subresource": "*", "expectation": "omitted"}, {"name": "secure-protocol", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": "no-referrer-when-downgrade", "redirection": "*", "origin": ["same-https", "cross-https"], "subresource": "*", "expectation": "stripped-referrer"}]}, {"name": "origin", "title": "Referrer Policy is set to 'origin'", "description": "Check that all subresources in all casses get only the origin portion of the referrer URL.", "specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin", "test_expansion": [{"name": "generic", "expansion": "default", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "origin", "redirection": "*", "origin": "*", "subresource": "*", "expectation": "origin"}]}, {"name": "same-origin", "title": "Referrer Policy is set to 'same-origin'", "description": "Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.", "specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin", "test_expansion": [{"name": "same-origin-insecure", "expansion": "default", "source_scheme": "http", "source_context_list": "*", "delivery_type": "*", "delivery_value": "same-origin", "redirection": "*", "origin": "same-http", "subresource": "*", "expectation": "stripped-referrer"}, {"name": "same-origin-secure-default", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": "same-origin", "redirection": "*", "origin": "same-https", "subresource": "*", "expectation": "stripped-referrer"}, {"name": "same-origin-insecure", "expansion": "override", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "same-origin", "redirection": "swap-origin", "origin": ["same-http", "same-https"], "subresource": "*", "expectation": "omitted"}, {"name": "cross-origin", "expansion": "default", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "same-origin", "redirection": "*", "origin": ["cross-http", "cross-https"], "subresource": "*", "expectation": "omitted"}]}, {"name": "origin-when-cross-origin", "title": "Referrer Policy is set to 'origin-when-cross-origin'", "description": "Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.", "specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin", "test_expansion": [{"name": "same-origin-insecure", "expansion": "default", "source_scheme": "http", "source_context_list": "*", "delivery_type": "*", "delivery_value": "origin-when-cross-origin", "redirection": "*", "origin": "same-http", "subresource": "*", "expectation": "stripped-referrer"}, {"name": "same-origin-secure-default", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": "origin-when-cross-origin", "redirection": "*", "origin": "same-https", "subresource": "*", "expectation": "stripped-referrer"}, {"name": "same-origin-upgrade", "expansion": "default", "source_scheme": "http", "source_context_list": "*", "delivery_type": "*", "delivery_value": "origin-when-cross-origin", "redirection": "*", "origin": "same-https", "subresource": "*", "expectation": "origin"}, {"name": "same-origin-downgrade", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": "origin-when-cross-origin", "redirection": "*", "origin": "same-http", "subresource": "*", "expectation": "origin"}, {"name": "same-origin-insecure", "expansion": "override", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "origin-when-cross-origin", "redirection": "swap-origin", "origin": ["same-http", "same-https"], "subresource": "*", "expectation": "origin"}, {"name": "cross-origin", "expansion": "default", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "origin-when-cross-origin", "redirection": "*", "origin": ["cross-http", "cross-https"], "subresource": "*", "expectation": "origin"}]}, {"name": "strict-origin", "title": "Referrer Policy is set to 'strict-origin'", "description": "Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.", "specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin", "test_expansion": [{"name": "insecure-protocol", "expansion": "default", "source_scheme": "http", "source_context_list": "*", "delivery_type": "*", "delivery_value": "strict-origin", "redirection": "*", "origin": ["same-http", "cross-http"], "subresource": "*", "expectation": "origin"}, {"name": "upgrade-protocol", "expansion": "default", "source_scheme": "http", "source_context_list": "*", "delivery_type": "*", "delivery_value": "strict-origin", "redirection": "*", "origin": ["same-https", "cross-https"], "subresource": "*", "expectation": "origin"}, {"name": "downgrade-protocol", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": "strict-origin", "redirection": "*", "origin": ["same-http", "cross-http"], "subresource": "*", "expectation": "omitted"}, {"name": "secure-protocol", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": "strict-origin", "redirection": "*", "origin": ["same-https", "cross-https"], "subresource": "*", "expectation": "origin"}]}, {"name": "strict-origin-when-cross-origin", "title": "Referrer Policy is set to 'strict-origin-when-cross-origin'", "description": "Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.", "specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin", "test_expansion": [{"name": "same-insecure", "expansion": "default", "source_scheme": "http", "source_context_list": "*", "delivery_type": "*", "delivery_value": "strict-origin-when-cross-origin", "redirection": "*", "origin": "same-http", "subresource": "*", "expectation": "stripped-referrer"}, {"name": "same-insecure", "expansion": "override", "source_scheme": "http", "source_context_list": "*", "delivery_type": "*", "delivery_value": "strict-origin-when-cross-origin", "redirection": "swap-origin", "origin": "same-http", "subresource": "*", "expectation": "origin"}, {"name": "cross-insecure", "expansion": "default", "source_scheme": "http", "source_context_list": "*", "delivery_type": "*", "delivery_value": "strict-origin-when-cross-origin", "redirection": "*", "origin": "cross-http", "subresource": "*", "expectation": "origin"}, {"name": "upgrade-protocol", "expansion": "default", "source_scheme": "http", "source_context_list": "*", "delivery_type": "*", "delivery_value": "strict-origin-when-cross-origin", "redirection": "*", "origin": ["same-https", "cross-https"], "subresource": "*", "expectation": "origin"}, {"name": "downgrade-protocol", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": "strict-origin-when-cross-origin", "redirection": "*", "origin": ["same-http", "cross-http"], "subresource": "*", "expectation": "omitted"}, {"name": "same-secure", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": "strict-origin-when-cross-origin", "redirection": "*", "origin": "same-https", "subresource": "*", "expectation": "stripped-referrer"}, {"name": "same-secure", "expansion": "override", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": "strict-origin-when-cross-origin", "redirection": "swap-origin", "origin": "same-https", "subresource": "*", "expectation": "origin"}, {"name": "cross-secure", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": "strict-origin-when-cross-origin", "redirection": "*", "origin": "cross-https", "subresource": "*", "expectation": "origin"}]}, {"name": "unsafe-url", "title": "Referrer Policy is set to 'unsafe-url'", "description": "Check that all sub-resources get the stripped referrer URL.", "specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url", "test_expansion": [{"name": "generic", "expansion": "default", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "unsafe-url", "redirection": "*", "origin": "*", "subresource": "*", "expectation": "stripped-referrer"}]}], "delivery_key": "referrerPolicy", "excluded_tests": [{"name": "cross-origin-workers", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "redirection": "*", "delivery_type": "*", "delivery_value": "*", "origin": ["cross-http", "cross-https"], "subresource": ["worker-classic", "worker-module", "sharedworker-classic"], "expectation": "*"}, {"name": "upgraded-protocol-workers", "expansion": "*", "source_scheme": "http", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": "*", "origin": ["same-https", "cross-https"], "subresource": ["worker-classic", "worker-module", "sharedworker-classic"], "expectation": "*"}, {"name": "mixed-content-insecure-subresources", "expansion": "*", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": "*", "origin": ["same-http", "cross-http"], "subresource": "*", "expectation": "*"}, {"name": "area-tag", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": "*", "origin": "*", "subresource": "area-tag", "expectation": "*"}, {"name": "worker-requests-with-swap-origin-redirect", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": "swap-origin", "origin": "*", "subresource": ["worker-classic", "worker-module", "sharedworker-classic"], "expectation": "*"}, {"name": "overhead-for-redirection", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": ["keep-origin", "swap-origin"], "origin": "*", "subresource": ["a-tag", "area-tag"], "expectation": "*"}, {"name": "source-https-unsupported-by-web-platform-tests-runners", "expansion": "*", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": "*", "origin": "*", "subresource": "*", "expectation": "*"}, {"name": "<link rel=noreferrer>'s delivery_value should be no-referrer", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "rel-noref", "delivery_value": [null, "no-referrer-when-downgrade", "same-origin", "origin", "origin-when-cross-origin", "strict-origin", "strict-origin-when-cross-origin", "unsafe-url"], "redirection": "*", "origin": "*", "subresource": "*", "expectation": "*"}], "source_context_schema": {"supported_delivery_type": {"top": ["meta", "http-rp"], "iframe": ["meta", "http-rp"], "iframe-blank": ["meta"], "srcdoc": ["meta"], "worker-classic": ["http-rp"], "worker-module": ["http-rp"], "worker-classic-data": [], "worker-module-data": []}, "supported_subresource": {"top": "*", "iframe": "*", "iframe-blank": "*", "srcdoc": "*", "worker-classic": ["xhr", "fetch", "worker-classic", "worker-module"], "worker-module": ["xhr", "fetch", "worker-classic", "worker-module"], "worker-classic-data": ["xhr", "fetch"], "worker-module-data": ["xhr", "fetch"]}}, "subresource_schema": {"supported_delivery_type": {"iframe-tag": ["attr"], "img-tag": ["attr"], "script-tag": ["attr"], "a-tag": ["attr", "rel-noref"], "area-tag": ["attr"], "xhr": [], "fetch": [], "worker-module": [], "sharedworker-classic": [], "worker-classic": []}}, "source_context_list_schema": {"top": {"description": "Policy set by the top-level Document", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}], "subresourcePolicyDeliveries": []}, "req": {"description": "Subresource request's policy should override Document's policy", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}], "subresourcePolicyDeliveries": ["nonNullPolicy"]}, "srcdoc-inherit": {"description": "srcdoc iframe should inherit parent Document's policy", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "srcdoc"}], "subresourcePolicyDeliveries": []}, "srcdoc": {"description": "srcdoc iframe's policy should override parent Document's policy", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}, {"sourceContextType": "srcdoc", "policyDeliveries": ["nonNullPolicy"]}], "subresourcePolicyDeliveries": []}, "iframe": {"description": "external iframe's policy should override parent Document's policy", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}, {"sourceContextType": "iframe", "policyDeliveries": ["policy"]}], "subresourcePolicyDeliveries": []}, "worker-classic": {"sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}, {"sourceContextType": "worker-classic", "policyDeliveries": ["policy"]}], "subresourcePolicyDeliveries": []}, "worker-classic-data": {"sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}, {"sourceContextType": "worker-classic-data", "policyDeliveries": ["policy"]}], "subresourcePolicyDeliveries": []}, "worker-module": {"sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}, {"sourceContextType": "worker-module", "policyDeliveries": ["policy"]}], "subresourcePolicyDeliveries": []}, "worker-module-data": {"sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}, {"sourceContextType": "worker-module-data", "policyDeliveries": ["policy"]}], "subresourcePolicyDeliveries": []}}, "test_expansion_schema": {"expansion": ["default", "override"], "delivery_type": ["attr", "rel-noref", "http-rp", "meta"], "delivery_value": [null, "no-referrer", "no-referrer-when-downgrade", "same-origin", "origin", "origin-when-cross-origin", "strict-origin", "strict-origin-when-cross-origin", "unsafe-url"], "origin": ["same-http", "same-https", "cross-http", "cross-https"], "source_context_list": ["top", "req", "srcdoc-inherit", "srcdoc", "iframe", "worker-classic", "worker-classic-data", "worker-module", "worker-module-data"], "source_scheme": ["http", "https"], "redirection": ["no-redirect", "keep-origin", "swap-origin"], "subresource": ["iframe-tag", "img-tag", "script-tag", "a-tag", "area-tag", "xhr", "worker-classic", "worker-module", "sharedworker-classic", "fetch"], "expectation": ["omitted", "origin", "stripped-referrer"]}};
diff --git a/tests/wpt/web-platform-tests/resources/chromium/nfc-mock.js b/tests/wpt/web-platform-tests/resources/chromium/nfc-mock.js
index 84c2726e09b..9211b8b7058 100644
--- a/tests/wpt/web-platform-tests/resources/chromium/nfc-mock.js
+++ b/tests/wpt/web-platform-tests/resources/chromium/nfc-mock.js
@@ -74,9 +74,9 @@ function compareNDEFRecords(providedRecord, receivedRecord) {
                       new Uint8Array(receivedRecord.data));
 }
 
-// Compares NDEFPushOptions structures that were provided to API and
+// Compares NDEFWriteOptions structures that were provided to API and
 // received by the mock mojo service.
-function assertNDEFPushOptionsEqual(provided, received) {
+function assertNDEFWriteOptionsEqual(provided, received) {
   if (provided.ignoreRead !== undefined)
     assert_equals(provided.ignoreRead, !!received.ignoreRead);
   else
@@ -149,7 +149,7 @@ var WebNFCTest = (() => {
 
       this.hw_status_ = NFCHWStatus.ENABLED;
       this.pushed_message_ = null;
-      this.pending_push_options_ = null;
+      this.pending_write_options_ = null;
       this.pending_promise_func_ = null;
       this.push_completed_ = true;
       this.client_ = null;
@@ -171,7 +171,7 @@ var WebNFCTest = (() => {
       }
 
       this.pushed_message_ = message;
-      this.pending_push_options_ = options;
+      this.pending_write_options_ = options;
       return new Promise(resolve => {
         if (this.operations_suspended_ || !this.push_completed_) {
           // Leaves the push pending.
@@ -256,8 +256,8 @@ var WebNFCTest = (() => {
       return this.pushed_message_;
     }
 
-    pushOptions() {
-      return this.pending_push_options_;
+    writeOptions() {
+      return this.pending_write_options_;
     }
 
     watchOptions() {
@@ -287,7 +287,7 @@ var WebNFCTest = (() => {
       }
 
       this.pushed_message_ = null;
-      this.pending_push_options_ = null;
+      this.pending_write_options_ = null;
       this.push_completed_ = true;
     }
 
@@ -296,8 +296,8 @@ var WebNFCTest = (() => {
       this.reading_messages_.push(message);
       // Ignores reading if NFC operation is suspended.
       if(this.operations_suspended_) return;
-      // Ignores reading if NDEFPushOptions.ignoreRead is true.
-      if (this.pending_push_options_ && this.pending_push_options_.ignoreRead)
+      // Ignores reading if NDEFWriteOptions.ignoreRead is true.
+      if (this.pending_write_options_ && this.pending_write_options_.ignoreRead)
         return;
       // Triggers onWatch if the new message matches existing watchers.
       for (let watcher of this.watchers_) {
diff --git a/tests/wpt/web-platform-tests/resources/chromium/webxr-test.js b/tests/wpt/web-platform-tests/resources/chromium/webxr-test.js
index 54788b4ca3d..ca627543aa4 100644
--- a/tests/wpt/web-platform-tests/resources/chromium/webxr-test.js
+++ b/tests/wpt/web-platform-tests/resources/chromium/webxr-test.js
@@ -551,8 +551,11 @@ class MockRuntime {
 
   // Mojo function implementations.
 
+  _injectAdditionalFrameData(options, frameData) {
+  }
+
   // XRFrameDataProvider implementation.
-  getFrameData() {
+  getFrameData(options) {
     let mojo_space_reset = this.send_mojo_space_reset_;
     this.send_mojo_space_reset_ = false;
     if (this.pose_) {
@@ -577,18 +580,21 @@ class MockRuntime {
     now += diff;
     now *= 1000000;
 
+    let frameData = {
+      pose: this.pose_,
+      mojoSpaceReset: mojo_space_reset,
+      inputState: input_state,
+      timeDelta: {
+        microseconds: now,
+      },
+      frameId: this.next_frame_id_++,
+      bufferHolder: null,
+      bufferSize: {},
+    };
+    this._injectAdditionalFrameData(options, frameData);
+
     return Promise.resolve({
-      frameData: {
-        pose: this.pose_,
-        mojoSpaceReset: mojo_space_reset,
-        inputState: input_state,
-        timeDelta: {
-          microseconds: now,
-        },
-        frameId: this.next_frame_id_++,
-        bufferHolder: null,
-        bufferSize: {}
-      }
+      frameData: frameData,
     });
   }
 
diff --git a/tests/wpt/web-platform-tests/server-timing/idlharness.https.any.js b/tests/wpt/web-platform-tests/server-timing/idlharness.https.any.js
index ded320f0f61..b55c741df39 100644
--- a/tests/wpt/web-platform-tests/server-timing/idlharness.https.any.js
+++ b/tests/wpt/web-platform-tests/server-timing/idlharness.https.any.js
@@ -6,11 +6,23 @@
 // https://w3c.github.io/server-timing/
 
 idl_test(
-  ['server-timing'],
-  ['resource-timing', 'performance-timeline'],
-  idl_array => {
-    idl_array.add_objects({
-      Performance: ['performance'],
-    });
-  }
+  ['resource-timing', 'server-timing'],
+  ['performance-timeline', 'hr-time', 'dom'],
+  idl_array => new Promise((resolve, reject) => {
+    new PerformanceObserver(entries => {
+      entries.getEntries().forEach(e => {
+        if (!e.name.endsWith('blue.png'))
+          return;
+
+        self.resource = e;
+        self.server = e.serverTiming[0];
+        idl_array.add_objects({
+          PerformanceResourceTiming: ['resource'],
+          PerformanceServerTiming: ['server']
+        });
+        resolve();
+      })
+    }).observe({entryTypes: ['resource']});
+    fetch('resources/blue.png');
+  })
 );
diff --git a/tests/wpt/web-platform-tests/tools/gitignore/gitignore.py b/tests/wpt/web-platform-tests/tools/gitignore/gitignore.py
index d5ea4a6a8f3..0f3d9450d12 100644
--- a/tests/wpt/web-platform-tests/tools/gitignore/gitignore.py
+++ b/tests/wpt/web-platform-tests/tools/gitignore/gitignore.py
@@ -269,7 +269,7 @@ class PathFilter(object):
                             target.append(item)
 
             dirnames[:] = keep_dirs
-            assert ".git" not in dirnames
+            assert not any(".git" == name for name, _ in dirnames)
             yield orig_dirpath, dirnames, keep_files
 
     def __call__(self,
diff --git a/tests/wpt/web-platform-tests/tools/mypy.ini b/tests/wpt/web-platform-tests/tools/mypy.ini
index ac8edd37d3a..b943b6d089a 100644
--- a/tests/wpt/web-platform-tests/tools/mypy.ini
+++ b/tests/wpt/web-platform-tests/tools/mypy.ini
@@ -1,12 +1,13 @@
 [mypy]
 #check_untyped_defs = True
-disallow_untyped_defs = True
 disallow_any_generics = True
 disallow_incomplete_defs = True
 disallow_subclassing_any = True
 disallow_untyped_calls = True
 disallow_untyped_decorators = True
+disallow_untyped_defs = True
 no_implicit_optional = True
+strict_equality = True
 warn_redundant_casts = True
 warn_return_any = True
 warn_unused_configs = True
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/fetch/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/fetch/cross-http-downgrade.downgrade.https.html
index b85583ff2ce..9c9de003230 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/fetch/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/fetch/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/fetch/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/fetch/cross-http-downgrade.no-redirect.https.html
index df420b3b922..13c51ce256f 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/fetch/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/fetch/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/fetch/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/fetch/cross-https.downgrade.https.html
index d4bb05e8307..3135cc6c8f9 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/fetch/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/fetch/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/fetch/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/fetch/same-http-downgrade.downgrade.https.html
index 6d15509430a..4fe6ab5bdce 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/fetch/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/fetch/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/fetch/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/fetch/same-http-downgrade.no-redirect.https.html
index 7a7fa666b06..7447bbe3264 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/fetch/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/fetch/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/fetch/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/fetch/same-https.downgrade.https.html
index f4a2cf3b00d..229c395f0c7 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/fetch/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/fetch/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/iframe-tag/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/iframe-tag/cross-http-downgrade.downgrade.https.html
index 77d852eb763..ccb1ba76409 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/iframe-tag/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/iframe-tag/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/iframe-tag/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/iframe-tag/cross-http-downgrade.no-redirect.https.html
index 8ddeada8b82..9c6aa964425 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/iframe-tag/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/iframe-tag/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/iframe-tag/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/iframe-tag/cross-https.downgrade.https.html
index ae8d161caec..4af67909eea 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/iframe-tag/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/iframe-tag/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/iframe-tag/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/iframe-tag/same-http-downgrade.downgrade.https.html
index 32f330f3d5c..608b4799a68 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/iframe-tag/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/iframe-tag/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/iframe-tag/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/iframe-tag/same-http-downgrade.no-redirect.https.html
index 52dd2dba9f7..b114aaba585 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/iframe-tag/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/iframe-tag/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/iframe-tag/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/iframe-tag/same-https.downgrade.https.html
index 884636534e0..fb1cb53f2e9 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/iframe-tag/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/iframe-tag/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/img-tag/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/img-tag/cross-http-downgrade.downgrade.https.html
index 4e663d506f0..42d1d89905d 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/img-tag/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/img-tag/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/img-tag/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/img-tag/cross-http-downgrade.no-redirect.https.html
index 3fe338de501..d7e03c78914 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/img-tag/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/img-tag/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/img-tag/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/img-tag/cross-https.downgrade.https.html
index d3b84f01637..ea90dcf5f2d 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/img-tag/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/img-tag/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/img-tag/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/img-tag/same-http-downgrade.downgrade.https.html
index e6f8e35fa21..702c96a1bb3 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/img-tag/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/img-tag/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/img-tag/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/img-tag/same-http-downgrade.no-redirect.https.html
index 0ad5ed13aa5..1975708b895 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/img-tag/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/img-tag/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/img-tag/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/img-tag/same-https.downgrade.https.html
index bd2ed054cff..931e800173a 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/img-tag/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/img-tag/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-classic/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-classic/same-http-downgrade.downgrade.https.html
index 86b0170706a..721e3597385 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-classic/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-classic/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-classic/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-classic/same-http-downgrade.no-redirect.https.html
index 274908b2b64..f6a0cdced13 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-classic/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-classic/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-classic/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-classic/same-https.downgrade.https.html
index 763fbd6d4ae..e3181df0e50 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-classic/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-classic/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/websocket/cross-ws-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/websocket/cross-ws-downgrade.no-redirect.https.html
index fe77266af21..d85c6364cc5 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/websocket/cross-ws-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/websocket/cross-ws-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/websocket/same-ws-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/websocket/same-ws-downgrade.no-redirect.https.html
index 7e27068e2fb..248a1c36c13 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/websocket/same-ws-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/websocket/same-ws-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-classic/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-classic/same-http-downgrade.downgrade.https.html
index 1144a7b9b11..09afa4a1ad5 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-classic/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-classic/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-classic/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-classic/same-http-downgrade.no-redirect.https.html
index 47ecc6f9946..6b84e67ef48 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-classic/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-classic/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-classic/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-classic/same-https.downgrade.https.html
index 3a75e263c7a..bdd607e66e2 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-classic/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-classic/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import-data/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import-data/cross-http-downgrade.downgrade.https.html
index cfb4519dd5b..4d52cdeb1fb 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import-data/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import-data/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import-data/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import-data/cross-http-downgrade.no-redirect.https.html
index 79e6ad25101..c9bdf6593f1 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import-data/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import-data/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import-data/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import-data/cross-https.downgrade.https.html
index 68064dccb9a..e67e525a19f 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import-data/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import-data/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import-data/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import-data/same-http-downgrade.downgrade.https.html
index fdb0f73e510..431ad44a837 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import-data/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import-data/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import-data/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import-data/same-http-downgrade.no-redirect.https.html
index df11191e370..5f13b366939 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import-data/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import-data/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import-data/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import-data/same-https.downgrade.https.html
index e3e47cf713a..4d25d60c24b 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import-data/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import-data/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-module/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-module/same-http-downgrade.downgrade.https.html
index 5976eb13ac0..a7ae596997c 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-module/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-module/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-module/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-module/same-http-downgrade.no-redirect.https.html
index 61932351631..39354703b01 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-module/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-module/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-module/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-module/same-https.downgrade.https.html
index 6c0cc3a6051..e638a447f99 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-module/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-module/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation-import-data/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation-import-data/cross-http-downgrade.downgrade.https.html
index 73f1ba54fd4..2b3bb7e2295 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation-import-data/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation-import-data/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation-import-data/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation-import-data/cross-http-downgrade.no-redirect.https.html
index 0267b811121..0e9543f869e 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation-import-data/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation-import-data/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation-import-data/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation-import-data/cross-https.downgrade.https.html
index dc014dea99c..df1c0cff004 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation-import-data/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation-import-data/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation-import-data/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation-import-data/same-http-downgrade.downgrade.https.html
index 781d3c65692..fcd6e8a362f 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation-import-data/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation-import-data/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation-import-data/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation-import-data/same-http-downgrade.no-redirect.https.html
index 9475c532a51..c7418b6ba9d 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation-import-data/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation-import-data/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation-import-data/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation-import-data/same-https.downgrade.https.html
index 7e574f94292..66cca764cad 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation-import-data/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation-import-data/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation/cross-http-downgrade.downgrade.https.html
index 8e0e431c156..4ccda7638c9 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation/cross-http-downgrade.no-redirect.https.html
index 70314595f53..17a743fdc2a 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation/cross-https.downgrade.https.html
index 126a81d2e1c..2d151d9942b 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation/same-http-downgrade.downgrade.https.html
index 9c4e0e29235..f15034029de 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation/same-http-downgrade.no-redirect.https.html
index 1360503d81b..3ec31ffd10e 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation/same-https.downgrade.https.html
index 5ed35529540..522553b624b 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio-import-data/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio-import-data/cross-http-downgrade.downgrade.https.html
index a61c8f79f39..cad46225e4a 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio-import-data/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio-import-data/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio-import-data/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio-import-data/cross-http-downgrade.no-redirect.https.html
index 61b78e82832..9577b03b199 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio-import-data/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio-import-data/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio-import-data/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio-import-data/cross-https.downgrade.https.html
index e4d12ee64c5..cada0f4f0c0 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio-import-data/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio-import-data/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio-import-data/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio-import-data/same-http-downgrade.downgrade.https.html
index 806e148059e..6fb498e0e6c 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio-import-data/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio-import-data/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio-import-data/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio-import-data/same-http-downgrade.no-redirect.https.html
index 11890a310b9..1bd15a79d1b 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio-import-data/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio-import-data/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio-import-data/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio-import-data/same-https.downgrade.https.html
index 4158e4e4eef..3f2b2407e06 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio-import-data/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio-import-data/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio/cross-http-downgrade.downgrade.https.html
index 032ddc9c40a..408ee4c610f 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio/cross-http-downgrade.no-redirect.https.html
index 63081ef51f2..a717fb6abeb 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio/cross-https.downgrade.https.html
index abd52ef4dc1..612e119b294 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio/same-http-downgrade.downgrade.https.html
index 9c7b931f3ef..a1f795f70b7 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio/same-http-downgrade.no-redirect.https.html
index 4cfa5018a38..678fecd445a 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio/same-https.downgrade.https.html
index a4aebcbbd98..e9c11fccf5c 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout-import-data/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout-import-data/cross-http-downgrade.downgrade.https.html
index 8eb246cb3a1..2b5ad961196 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout-import-data/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout-import-data/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout-import-data/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout-import-data/cross-http-downgrade.no-redirect.https.html
index ce5fcdc9cfd..1799a9eb722 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout-import-data/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout-import-data/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout-import-data/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout-import-data/cross-https.downgrade.https.html
index a765c02906a..f7d0927e332 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout-import-data/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout-import-data/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout-import-data/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout-import-data/same-http-downgrade.downgrade.https.html
index d83ecefa811..2d7cca9fb4b 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout-import-data/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout-import-data/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout-import-data/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout-import-data/same-http-downgrade.no-redirect.https.html
index d7d6ff4f9d5..2195c81344d 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout-import-data/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout-import-data/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout-import-data/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout-import-data/same-https.downgrade.https.html
index 34b9b4a5350..21103ffcd28 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout-import-data/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout-import-data/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout/cross-http-downgrade.downgrade.https.html
index 45715ea321e..ec1b48ecf2c 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout/cross-http-downgrade.no-redirect.https.html
index 99a80ac2349..ebf1ddc2ee5 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout/cross-https.downgrade.https.html
index 2776905a788..9643c59f470 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout/same-http-downgrade.downgrade.https.html
index 275dc056892..578aaa88880 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout/same-http-downgrade.no-redirect.https.html
index 3f72a04ab5c..19af6b4ea00 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout/same-https.downgrade.https.html
index e038c8edbaa..1a25c627f12 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint-import-data/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint-import-data/cross-http-downgrade.downgrade.https.html
index 367bedfb2e1..67465fe1f12 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint-import-data/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint-import-data/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint-import-data/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint-import-data/cross-http-downgrade.no-redirect.https.html
index 45c8a2cbb42..63ed3803bcd 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint-import-data/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint-import-data/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint-import-data/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint-import-data/cross-https.downgrade.https.html
index 8b3ad88a2c3..dc5e9299fe1 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint-import-data/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint-import-data/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint-import-data/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint-import-data/same-http-downgrade.downgrade.https.html
index 9d9fe1d50de..ae96afc66cf 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint-import-data/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint-import-data/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint-import-data/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint-import-data/same-http-downgrade.no-redirect.https.html
index d08ddfbd465..4389e79c1c5 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint-import-data/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint-import-data/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint-import-data/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint-import-data/same-https.downgrade.https.html
index e9e26b1991f..3f19963530b 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint-import-data/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint-import-data/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint/cross-http-downgrade.downgrade.https.html
index 37d16b63a4e..906fe393342 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint/cross-http-downgrade.no-redirect.https.html
index 3336529a41a..96b32dc3de2 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint/cross-https.downgrade.https.html
index 35ffbd75717..14064fdb072 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint/same-http-downgrade.downgrade.https.html
index b92163e44e8..df5f7cf42ed 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint/same-http-downgrade.no-redirect.https.html
index bab2213df09..47109c554b9 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint/same-https.downgrade.https.html
index 7a1e3f58291..65990ae0130 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/xhr/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/xhr/cross-http-downgrade.downgrade.https.html
index 87f334e7446..e06f46e8ca9 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/xhr/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/xhr/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/xhr/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/xhr/cross-http-downgrade.no-redirect.https.html
index 077f00c4ae2..c60709b78d1 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/xhr/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/xhr/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/xhr/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/xhr/cross-https.downgrade.https.html
index 112f3c08685..bec4fb99f46 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/xhr/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/xhr/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/xhr/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/xhr/same-http-downgrade.downgrade.https.html
index fa4303f5040..8b48b85e967 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/xhr/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/xhr/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/xhr/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/xhr/same-http-downgrade.no-redirect.https.html
index 066aae1b898..aba56550513 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/xhr/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/xhr/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/xhr/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/xhr/same-https.downgrade.https.html
index 76117295141..78f91b19629 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/xhr/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/xhr/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/fetch/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/fetch/cross-http-downgrade.downgrade.https.html
index 4d815c09833..a8c1f60a83a 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/fetch/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/fetch/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/fetch/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/fetch/cross-http-downgrade.no-redirect.https.html
index cde4f053c81..67931e2bcd4 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/fetch/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/fetch/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/fetch/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/fetch/cross-https.downgrade.https.html
index 3ef18070f9f..a420b76c468 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/fetch/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/fetch/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/fetch/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/fetch/same-http-downgrade.downgrade.https.html
index 1162d570b15..c017e8c22f1 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/fetch/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/fetch/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/fetch/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/fetch/same-http-downgrade.no-redirect.https.html
index a001d36f709..f288ec70431 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/fetch/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/fetch/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/fetch/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/fetch/same-https.downgrade.https.html
index c120ee16693..de6d8e06579 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/fetch/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/fetch/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/iframe-tag/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/iframe-tag/cross-http-downgrade.downgrade.https.html
index ddc751483fe..a9385cd9d31 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/iframe-tag/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/iframe-tag/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/iframe-tag/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/iframe-tag/cross-http-downgrade.no-redirect.https.html
index f55db96fc32..6cf723c0ef2 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/iframe-tag/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/iframe-tag/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/iframe-tag/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/iframe-tag/cross-https.downgrade.https.html
index f16e2151ff5..597225f83ec 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/iframe-tag/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/iframe-tag/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/iframe-tag/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/iframe-tag/same-http-downgrade.downgrade.https.html
index 461d81f9c3c..655557d3926 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/iframe-tag/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/iframe-tag/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/iframe-tag/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/iframe-tag/same-http-downgrade.no-redirect.https.html
index cfb5a665ba1..339e78b77c9 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/iframe-tag/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/iframe-tag/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/iframe-tag/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/iframe-tag/same-https.downgrade.https.html
index eef7cf47939..7b9a90f91c6 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/iframe-tag/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/iframe-tag/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/img-tag/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/img-tag/cross-http-downgrade.downgrade.https.html
index 4b45675dff2..e6ee8929e2c 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/img-tag/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/img-tag/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/img-tag/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/img-tag/cross-http-downgrade.no-redirect.https.html
index 1305ce818a0..c4018e7349a 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/img-tag/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/img-tag/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/img-tag/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/img-tag/cross-https.downgrade.https.html
index eac2bbf8f73..cafea33dc5f 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/img-tag/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/img-tag/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/img-tag/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/img-tag/same-http-downgrade.downgrade.https.html
index 6a03e5715b0..62b7157b24c 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/img-tag/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/img-tag/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/img-tag/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/img-tag/same-http-downgrade.no-redirect.https.html
index 2a38cb54683..a8655a88184 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/img-tag/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/img-tag/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/img-tag/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/img-tag/same-https.downgrade.https.html
index 9e3e1bf9cf1..2b2677ad0a7 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/img-tag/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/img-tag/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-classic/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-classic/same-http-downgrade.downgrade.https.html
index 884844f93a2..a63e0e90d25 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-classic/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-classic/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-classic/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-classic/same-http-downgrade.no-redirect.https.html
index 5f4ef1d0799..1bd43d71204 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-classic/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-classic/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-classic/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-classic/same-https.downgrade.https.html
index 800de216b57..d14816246a2 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-classic/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-classic/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html
index ccbff1f2520..a79e3c6d933 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/websocket/same-ws-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/websocket/same-ws-downgrade.no-redirect.https.html
index 6fcd98373ee..7010694ed4a 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/websocket/same-ws-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/websocket/same-ws-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-classic/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-classic/same-http-downgrade.downgrade.https.html
index c033a44cd9b..208365f8510 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-classic/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-classic/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-classic/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-classic/same-http-downgrade.no-redirect.https.html
index 99cee0b279e..e5c4a1f9e01 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-classic/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-classic/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-classic/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-classic/same-https.downgrade.https.html
index b542ddc27a8..0c1aa11ea23 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-classic/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-classic/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import-data/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import-data/cross-http-downgrade.downgrade.https.html
index a11b956cfd5..3f75dd6a3c8 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import-data/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import-data/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import-data/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import-data/cross-http-downgrade.no-redirect.https.html
index 0369b4d4243..f10db857124 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import-data/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import-data/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import-data/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import-data/cross-https.downgrade.https.html
index b10b8bc2c37..13138237f62 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import-data/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import-data/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import-data/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import-data/same-http-downgrade.downgrade.https.html
index 276c608c2d4..b89ca84621e 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import-data/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import-data/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import-data/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import-data/same-http-downgrade.no-redirect.https.html
index a8178823113..3a6ef2d862b 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import-data/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import-data/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import-data/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import-data/same-https.downgrade.https.html
index 1c88f0066f6..93d0b562378 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import-data/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import-data/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-module/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-module/same-http-downgrade.downgrade.https.html
index 80299bba9f3..5a706ea7473 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-module/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-module/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-module/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-module/same-http-downgrade.no-redirect.https.html
index 2d7a2070d3b..a52897c914b 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-module/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-module/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-module/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-module/same-https.downgrade.https.html
index a73e68bfb4e..4ca4a56c802 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-module/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-module/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation-import-data/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation-import-data/cross-http-downgrade.downgrade.https.html
index f3b00d61d51..773b363f4de 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation-import-data/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation-import-data/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation-import-data/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation-import-data/cross-http-downgrade.no-redirect.https.html
index 4b42be9e79b..a4ef7937f14 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation-import-data/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation-import-data/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation-import-data/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation-import-data/cross-https.downgrade.https.html
index 279fb691fd3..6ff75d0a694 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation-import-data/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation-import-data/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation-import-data/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation-import-data/same-http-downgrade.downgrade.https.html
index 302bc0c2046..8a8a3ade1f0 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation-import-data/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation-import-data/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation-import-data/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation-import-data/same-http-downgrade.no-redirect.https.html
index 5f90729c0fc..3336b939181 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation-import-data/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation-import-data/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation-import-data/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation-import-data/same-https.downgrade.https.html
index b639698b974..ef5059ee6c0 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation-import-data/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation-import-data/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation/cross-http-downgrade.downgrade.https.html
index ce203e6d65c..c1b6b812fc8 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation/cross-http-downgrade.no-redirect.https.html
index efb198727fe..eec4f30e3dd 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation/cross-https.downgrade.https.html
index 6baa7f45ebf..71a5f8e4be3 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation/same-http-downgrade.downgrade.https.html
index 439a7c9a226..c9427314fd8 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation/same-http-downgrade.no-redirect.https.html
index 3fad5f1021d..57153200c44 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation/same-https.downgrade.https.html
index ff5bd878fdc..19fdd9e1602 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio-import-data/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio-import-data/cross-http-downgrade.downgrade.https.html
index 350f8a63f05..6351a2aa878 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio-import-data/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio-import-data/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio-import-data/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio-import-data/cross-http-downgrade.no-redirect.https.html
index 5662c12dbb8..53d044465fd 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio-import-data/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio-import-data/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio-import-data/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio-import-data/cross-https.downgrade.https.html
index 5fb887f80ee..af419ebf2eb 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio-import-data/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio-import-data/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio-import-data/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio-import-data/same-http-downgrade.downgrade.https.html
index 36d14f7f5aa..383ef5351fc 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio-import-data/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio-import-data/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio-import-data/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio-import-data/same-http-downgrade.no-redirect.https.html
index 35298ee1b80..7695e21ba99 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio-import-data/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio-import-data/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio-import-data/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio-import-data/same-https.downgrade.https.html
index ecc03d266e6..0ffaa8aea19 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio-import-data/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio-import-data/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio/cross-http-downgrade.downgrade.https.html
index 4dff0bf1b2d..2d3f37b088d 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio/cross-http-downgrade.no-redirect.https.html
index 14206c8fd12..0c11b873098 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio/cross-https.downgrade.https.html
index 82b7ecbea44..e8bd73f4fc2 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio/same-http-downgrade.downgrade.https.html
index a5885baa2fc..83bd891b009 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio/same-http-downgrade.no-redirect.https.html
index 47337cdcb96..9e71b60a622 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio/same-https.downgrade.https.html
index 2a03d160571..207dc1bd292 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout-import-data/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout-import-data/cross-http-downgrade.downgrade.https.html
index 7fe5ae10f31..1fd1b65ac58 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout-import-data/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout-import-data/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout-import-data/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout-import-data/cross-http-downgrade.no-redirect.https.html
index b6b6e029df9..7c3716a4bf9 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout-import-data/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout-import-data/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout-import-data/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout-import-data/cross-https.downgrade.https.html
index abd8f2624ea..ae72b58c865 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout-import-data/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout-import-data/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout-import-data/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout-import-data/same-http-downgrade.downgrade.https.html
index 14bcb5f47e0..dcdbb6a7ada 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout-import-data/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout-import-data/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout-import-data/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout-import-data/same-http-downgrade.no-redirect.https.html
index 241ef910689..cabced3f61d 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout-import-data/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout-import-data/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout-import-data/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout-import-data/same-https.downgrade.https.html
index 0b3ea13ad34..5d42ff456cf 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout-import-data/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout-import-data/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout/cross-http-downgrade.downgrade.https.html
index 01023441d82..67c05c79922 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout/cross-http-downgrade.no-redirect.https.html
index ced106f8f2b..96d4cf80764 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout/cross-https.downgrade.https.html
index 96bb1c7fc33..55dab1beb52 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout/same-http-downgrade.downgrade.https.html
index d63911d54bf..ebd45d92bb6 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout/same-http-downgrade.no-redirect.https.html
index f7dd01186fe..2790511c3c0 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout/same-https.downgrade.https.html
index 072e5d3ca96..138f5e1a3bf 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint-import-data/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint-import-data/cross-http-downgrade.downgrade.https.html
index 89f861305c2..2782ed171f2 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint-import-data/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint-import-data/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint-import-data/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint-import-data/cross-http-downgrade.no-redirect.https.html
index ded8c8320f8..ac8b65a4314 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint-import-data/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint-import-data/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint-import-data/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint-import-data/cross-https.downgrade.https.html
index 7ebca39bec6..a3760aa9f5d 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint-import-data/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint-import-data/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint-import-data/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint-import-data/same-http-downgrade.downgrade.https.html
index 266bb331dac..b59a96970ab 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint-import-data/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint-import-data/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint-import-data/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint-import-data/same-http-downgrade.no-redirect.https.html
index 2d2cbdc8056..ae1f7ca7603 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint-import-data/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint-import-data/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint-import-data/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint-import-data/same-https.downgrade.https.html
index b37b7ad7e49..b9bb91b94f2 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint-import-data/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint-import-data/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint/cross-http-downgrade.downgrade.https.html
index 9e8c20c4d4a..7857def8a13 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint/cross-http-downgrade.no-redirect.https.html
index cc521e77d58..996501e225e 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint/cross-https.downgrade.https.html
index 59b4555e33c..93fb65ff1e5 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint/same-http-downgrade.downgrade.https.html
index e0a2a80419c..f5b4a996318 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint/same-http-downgrade.no-redirect.https.html
index 0c0fe5c37ce..f762298b167 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint/same-https.downgrade.https.html
index 8d3ab709d9c..8855ee11407 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/xhr/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/xhr/cross-http-downgrade.downgrade.https.html
index 4bbdbc0178c..415f306d80e 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/xhr/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/xhr/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/xhr/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/xhr/cross-http-downgrade.no-redirect.https.html
index e2c199e9eca..11b4f6cb0e4 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/xhr/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/xhr/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/xhr/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/xhr/cross-https.downgrade.https.html
index 614e6e837bf..5528ff69ac4 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/xhr/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/xhr/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/xhr/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/xhr/same-http-downgrade.downgrade.https.html
index ee3bfdaa7b0..f677ac587f4 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/xhr/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/xhr/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/xhr/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/xhr/same-http-downgrade.no-redirect.https.html
index 969e0cfd717..9ef3ddfda4f 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/xhr/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/xhr/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/xhr/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/xhr/same-https.downgrade.https.html
index af181e9462c..ca46e296a44 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/xhr/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/xhr/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/fetch/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/fetch/cross-http-downgrade.downgrade.https.html
index 6f165b83c1c..29ad963e1f3 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/fetch/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/fetch/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/fetch/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/fetch/cross-http-downgrade.no-redirect.https.html
index c154ae6d42a..eadf65c4469 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/fetch/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/fetch/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/fetch/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/fetch/cross-https.downgrade.https.html
index 19cada4b116..66e4fe89cd7 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/fetch/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/fetch/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/fetch/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/fetch/same-http-downgrade.downgrade.https.html
index 7cfede29479..8e1384f04a4 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/fetch/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/fetch/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/fetch/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/fetch/same-http-downgrade.no-redirect.https.html
index 54a5e9a1cd2..1db67f249f5 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/fetch/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/fetch/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/fetch/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/fetch/same-https.downgrade.https.html
index 9ec1a6777cc..d31e2c8365d 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/fetch/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/fetch/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/iframe-tag/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/iframe-tag/cross-http-downgrade.downgrade.https.html
index 9b4828ac45e..bb4cd08752c 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/iframe-tag/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/iframe-tag/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/iframe-tag/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/iframe-tag/cross-http-downgrade.no-redirect.https.html
index f6342e1a26f..931b55e77fa 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/iframe-tag/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/iframe-tag/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/iframe-tag/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/iframe-tag/cross-https.downgrade.https.html
index 48966792c3b..c1a84d11bee 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/iframe-tag/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/iframe-tag/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/iframe-tag/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/iframe-tag/same-http-downgrade.downgrade.https.html
index efa9eba08e5..c5febd94379 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/iframe-tag/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/iframe-tag/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/iframe-tag/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/iframe-tag/same-http-downgrade.no-redirect.https.html
index 2e78cec61ec..4f2ac5ea1c3 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/iframe-tag/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/iframe-tag/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/iframe-tag/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/iframe-tag/same-https.downgrade.https.html
index 7c3d637ad42..5c4e84b3f64 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/iframe-tag/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/iframe-tag/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/img-tag/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/img-tag/cross-http-downgrade.downgrade.https.html
index ec4bc932d80..277181b5a30 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/img-tag/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/img-tag/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/img-tag/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/img-tag/cross-http-downgrade.no-redirect.https.html
index 139b07bf21d..7bc80458239 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/img-tag/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/img-tag/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.downgrade.https.html
index 0c325ea3f38..15b0068bab6 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/img-tag/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/img-tag/same-http-downgrade.downgrade.https.html
index e82d1c11e8a..7536b0d1b48 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/img-tag/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/img-tag/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/img-tag/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/img-tag/same-http-downgrade.no-redirect.https.html
index 64ba3c24ca3..a4accfd9bb3 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/img-tag/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/img-tag/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/img-tag/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/img-tag/same-https.downgrade.https.html
index f7251e7b494..47d3a947047 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/img-tag/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/img-tag/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/sharedworker-classic/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/sharedworker-classic/same-http-downgrade.downgrade.https.html
index 4eb31979ea6..81817a9fc4d 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/sharedworker-classic/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/sharedworker-classic/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/sharedworker-classic/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/sharedworker-classic/same-http-downgrade.no-redirect.https.html
index 91eb40ea62f..4bb57dbc9a9 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/sharedworker-classic/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/sharedworker-classic/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/sharedworker-classic/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/sharedworker-classic/same-https.downgrade.https.html
index 36554b70c19..5ed7f7b3afb 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/sharedworker-classic/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/sharedworker-classic/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/websocket/cross-ws-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/websocket/cross-ws-downgrade.no-redirect.https.html
index 8212f346cce..d4665f488e9 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/websocket/cross-ws-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/websocket/cross-ws-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/websocket/same-ws-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/websocket/same-ws-downgrade.no-redirect.https.html
index 5cb9d5f2b66..c6390dc89ab 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/websocket/same-ws-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/websocket/same-ws-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-classic/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-classic/same-http-downgrade.downgrade.https.html
index 7d6a1f9cd9e..76410cfc8b9 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-classic/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-classic/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-classic/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-classic/same-http-downgrade.no-redirect.https.html
index 106ec53007d..9b13c7b2d14 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-classic/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-classic/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-classic/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-classic/same-https.downgrade.https.html
index ca8c3d69cd0..b8742944da1 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-classic/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-classic/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import-data/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import-data/cross-http-downgrade.downgrade.https.html
index dbd24d34e9b..42e20249f6d 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import-data/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import-data/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import-data/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import-data/cross-http-downgrade.no-redirect.https.html
index 6514b983f2f..93639049818 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import-data/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import-data/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import-data/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import-data/cross-https.downgrade.https.html
index 18f496083f2..b738fa5ab22 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import-data/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import-data/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import-data/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import-data/same-http-downgrade.downgrade.https.html
index 0c16aff1991..ce6ed5ea0c4 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import-data/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import-data/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import-data/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import-data/same-http-downgrade.no-redirect.https.html
index 524b56d2ed3..a76b9859411 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import-data/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import-data/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import-data/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import-data/same-https.downgrade.https.html
index c6339c9dd41..5970537a1a0 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import-data/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import-data/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-module/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-module/same-http-downgrade.downgrade.https.html
index da5ea1a8a0f..e8d97f650da 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-module/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-module/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-module/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-module/same-http-downgrade.no-redirect.https.html
index 3896037c69d..257d4f59375 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-module/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-module/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-module/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-module/same-https.downgrade.https.html
index 039baf92d15..5f400ca041a 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-module/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-module/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation-import-data/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation-import-data/cross-http-downgrade.downgrade.https.html
index 0309cb04230..2acfaba089c 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation-import-data/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation-import-data/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation-import-data/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation-import-data/cross-http-downgrade.no-redirect.https.html
index 2434b964975..40d119b13a6 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation-import-data/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation-import-data/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation-import-data/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation-import-data/cross-https.downgrade.https.html
index ba6f77826a4..0c691b43e29 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation-import-data/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation-import-data/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation-import-data/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation-import-data/same-http-downgrade.downgrade.https.html
index 6ebeaa6dc83..6cc28ebd636 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation-import-data/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation-import-data/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation-import-data/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation-import-data/same-http-downgrade.no-redirect.https.html
index c1c863566d3..f34a8843b3e 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation-import-data/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation-import-data/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation-import-data/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation-import-data/same-https.downgrade.https.html
index 9298d15d08a..63c32d16ccd 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation-import-data/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation-import-data/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation/cross-http-downgrade.downgrade.https.html
index a26939d2888..ccab7434376 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation/cross-http-downgrade.no-redirect.https.html
index 2a4cf1e56d8..dd5a07aec5e 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation/cross-https.downgrade.https.html
index 154b6d0c812..c495e67f661 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation/same-http-downgrade.downgrade.https.html
index bb1c98a99be..85ab9af88cf 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation/same-http-downgrade.no-redirect.https.html
index 1c7729e0076..f1ec2b850e4 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation/same-https.downgrade.https.html
index 9672cfacc00..aa9280e316b 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio-import-data/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio-import-data/cross-http-downgrade.downgrade.https.html
index 673dcb393ad..c043ed304e5 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio-import-data/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio-import-data/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio-import-data/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio-import-data/cross-http-downgrade.no-redirect.https.html
index 4ef84c7d605..15e6ad289c8 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio-import-data/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio-import-data/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio-import-data/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio-import-data/cross-https.downgrade.https.html
index 6b6d8d918fe..a18b8f14766 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio-import-data/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio-import-data/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio-import-data/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio-import-data/same-http-downgrade.downgrade.https.html
index c7e3806b3b7..2b5e6755761 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio-import-data/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio-import-data/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio-import-data/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio-import-data/same-http-downgrade.no-redirect.https.html
index e25c166085d..e95acc2a761 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio-import-data/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio-import-data/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio-import-data/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio-import-data/same-https.downgrade.https.html
index 911ba1494e6..9e6eca74acc 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio-import-data/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio-import-data/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio/cross-http-downgrade.downgrade.https.html
index e4362718a20..c08cf7100f0 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio/cross-http-downgrade.no-redirect.https.html
index 0248efb910f..75478c090a8 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio/cross-https.downgrade.https.html
index 06194f2410e..ffc0a7be048 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio/same-http-downgrade.downgrade.https.html
index bf9cada8a18..1243c576e16 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio/same-http-downgrade.no-redirect.https.html
index 413116bcf29..64632c6d764 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio/same-https.downgrade.https.html
index c067eba1905..4afab488c32 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout-import-data/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout-import-data/cross-http-downgrade.downgrade.https.html
index 141146d5641..b32fc7d3887 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout-import-data/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout-import-data/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout-import-data/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout-import-data/cross-http-downgrade.no-redirect.https.html
index 075d6d2e57e..5d335335b6c 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout-import-data/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout-import-data/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout-import-data/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout-import-data/cross-https.downgrade.https.html
index 5f93b90b63b..5409a86d169 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout-import-data/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout-import-data/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout-import-data/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout-import-data/same-http-downgrade.downgrade.https.html
index 494acbeaa7b..640fc9ca283 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout-import-data/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout-import-data/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout-import-data/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout-import-data/same-http-downgrade.no-redirect.https.html
index 8342a27b190..715b1276c2d 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout-import-data/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout-import-data/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout-import-data/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout-import-data/same-https.downgrade.https.html
index de0e3f5c25a..cd0dbe2f23d 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout-import-data/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout-import-data/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout/cross-http-downgrade.downgrade.https.html
index ca849d8bfe0..747c0290587 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout/cross-http-downgrade.no-redirect.https.html
index 276e785e30f..c85a6cb2447 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout/cross-https.downgrade.https.html
index 0cb383af95a..f45855c3133 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout/same-http-downgrade.downgrade.https.html
index eb79935b7bf..3e5bcb4a777 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout/same-http-downgrade.no-redirect.https.html
index 823e1f14a5f..08f7e751d1b 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout/same-https.downgrade.https.html
index d28a67c7d86..886417f2fe6 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint-import-data/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint-import-data/cross-http-downgrade.downgrade.https.html
index 8afab244938..cd96e54aaac 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint-import-data/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint-import-data/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint-import-data/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint-import-data/cross-http-downgrade.no-redirect.https.html
index 95bfb178a36..93e3b9b9565 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint-import-data/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint-import-data/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint-import-data/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint-import-data/cross-https.downgrade.https.html
index c54e3fa73e7..debc2f8fb1a 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint-import-data/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint-import-data/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint-import-data/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint-import-data/same-http-downgrade.downgrade.https.html
index 0608f35a1e9..c1200df0a8c 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint-import-data/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint-import-data/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint-import-data/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint-import-data/same-http-downgrade.no-redirect.https.html
index 6d1eaad3553..c9ab2def155 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint-import-data/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint-import-data/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint-import-data/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint-import-data/same-https.downgrade.https.html
index 31a8aecee61..24a3a5e232f 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint-import-data/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint-import-data/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint/cross-http-downgrade.downgrade.https.html
index dd9c10d27c6..3a8af0180ef 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint/cross-http-downgrade.no-redirect.https.html
index c7db718d84b..b7f0a3d5c8d 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint/cross-https.downgrade.https.html
index d1f554ff94d..2e79c3967f2 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint/same-http-downgrade.downgrade.https.html
index 474b54b2a12..0978ef69233 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint/same-http-downgrade.no-redirect.https.html
index a72e46f34b4..335792e8e10 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint/same-https.downgrade.https.html
index 212288de464..603fac3f625 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/xhr/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/xhr/cross-http-downgrade.downgrade.https.html
index 8647515e7e9..5383e837c25 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/xhr/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/xhr/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/xhr/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/xhr/cross-http-downgrade.no-redirect.https.html
index e1eb57b8a09..c09e7ba15d7 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/xhr/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/xhr/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/xhr/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/xhr/cross-https.downgrade.https.html
index bb110192d28..64273879fd6 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/xhr/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/xhr/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/xhr/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/xhr/same-http-downgrade.downgrade.https.html
index 8edb94b6b02..2aec53e2c3a 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/xhr/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/xhr/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/xhr/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/xhr/same-http-downgrade.no-redirect.https.html
index 38d91f26928..4bcfa708a37 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/xhr/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/xhr/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/xhr/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/xhr/same-https.downgrade.https.html
index 2bce883ad36..ccf34f0e811 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/xhr/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/xhr/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/fetch/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/fetch/cross-http-downgrade.downgrade.https.html
index a551418cb19..aee9de0c82a 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/fetch/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/fetch/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/fetch/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/fetch/cross-http-downgrade.no-redirect.https.html
index f4d9cc7fbf0..5bfb72d9578 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/fetch/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/fetch/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/fetch/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/fetch/cross-https.downgrade.https.html
index 123b1eba945..cbe415495a6 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/fetch/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/fetch/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/fetch/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/fetch/same-http-downgrade.downgrade.https.html
index c64f24573b6..eeffa86cd64 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/fetch/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/fetch/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/fetch/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/fetch/same-http-downgrade.no-redirect.https.html
index f9d119487b5..b2b97f9eb31 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/fetch/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/fetch/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/fetch/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/fetch/same-https.downgrade.https.html
index 5b132dd6996..d1aed06207c 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/fetch/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/fetch/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/iframe-tag/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/iframe-tag/cross-http-downgrade.downgrade.https.html
index 6b0f777b060..a6b861d8f3b 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/iframe-tag/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/iframe-tag/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/iframe-tag/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/iframe-tag/cross-http-downgrade.no-redirect.https.html
index fc07cfc37c7..24b4b80b901 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/iframe-tag/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/iframe-tag/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/iframe-tag/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/iframe-tag/cross-https.downgrade.https.html
index 06b2b8ee803..2726b855e27 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/iframe-tag/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/iframe-tag/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/iframe-tag/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/iframe-tag/same-http-downgrade.downgrade.https.html
index 0c84e45c6b2..dcf7afefb6d 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/iframe-tag/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/iframe-tag/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/iframe-tag/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/iframe-tag/same-http-downgrade.no-redirect.https.html
index 9430c55226a..5b1aeb953bf 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/iframe-tag/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/iframe-tag/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/iframe-tag/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/iframe-tag/same-https.downgrade.https.html
index 5d78db1ea99..baec6951412 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/iframe-tag/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/iframe-tag/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/img-tag/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/img-tag/cross-http-downgrade.downgrade.https.html
index 818f0181b92..ebe5c7daec0 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/img-tag/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/img-tag/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/img-tag/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/img-tag/cross-http-downgrade.no-redirect.https.html
index 3c5eb7fd4f9..5df9e97602c 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/img-tag/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/img-tag/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/img-tag/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/img-tag/cross-https.downgrade.https.html
index d636efdc455..b822e9311ac 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/img-tag/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/img-tag/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/img-tag/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/img-tag/same-http-downgrade.downgrade.https.html
index 24eb4fcdd9d..592789b68e2 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/img-tag/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/img-tag/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/img-tag/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/img-tag/same-http-downgrade.no-redirect.https.html
index c71a1f235c1..48ff84bd4f0 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/img-tag/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/img-tag/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/img-tag/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/img-tag/same-https.downgrade.https.html
index 1b200882673..c31b823432c 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/img-tag/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/img-tag/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-classic/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-classic/same-http-downgrade.downgrade.https.html
index 24badc0b54b..7c40b6bd618 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-classic/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-classic/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-classic/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-classic/same-http-downgrade.no-redirect.https.html
index 3b90431dec4..4ee70c5737a 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-classic/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-classic/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-classic/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-classic/same-https.downgrade.https.html
index d8df110ca21..a37cf7b1c12 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-classic/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-classic/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html
index b1f5b39f02e..75e6a885f59 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/websocket/same-ws-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/websocket/same-ws-downgrade.no-redirect.https.html
index 64e96fd5511..25ada112805 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/websocket/same-ws-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/websocket/same-ws-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-classic/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-classic/same-http-downgrade.downgrade.https.html
index 90368ada345..80392491f00 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-classic/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-classic/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-classic/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-classic/same-http-downgrade.no-redirect.https.html
index 7155bcabc83..ab26c04620d 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-classic/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-classic/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-classic/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-classic/same-https.downgrade.https.html
index 1293e4bfdde..c415822392c 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-classic/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-classic/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import-data/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import-data/cross-http-downgrade.downgrade.https.html
index f045f76b743..9785dbe4357 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import-data/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import-data/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import-data/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import-data/cross-http-downgrade.no-redirect.https.html
index 4e846317d2f..c4676db028d 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import-data/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import-data/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import-data/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import-data/cross-https.downgrade.https.html
index c1c95cc4e27..fc590e7271a 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import-data/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import-data/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import-data/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import-data/same-http-downgrade.downgrade.https.html
index d9bcd0163ef..d814072e41d 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import-data/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import-data/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import-data/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import-data/same-http-downgrade.no-redirect.https.html
index 26eeefb54a1..75cbf68253a 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import-data/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import-data/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import-data/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import-data/same-https.downgrade.https.html
index 2208f8879c0..61b8125544f 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import-data/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import-data/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-module/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-module/same-http-downgrade.downgrade.https.html
index 6a09e8c9d3a..a3a3783570e 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-module/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-module/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-module/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-module/same-http-downgrade.no-redirect.https.html
index c249771c7a1..bb07520c8dd 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-module/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-module/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-module/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-module/same-https.downgrade.https.html
index 42b62af0edf..77d6de88ecb 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-module/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-module/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation-import-data/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation-import-data/cross-http-downgrade.downgrade.https.html
index 90fe184c08f..9682eb51719 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation-import-data/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation-import-data/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation-import-data/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation-import-data/cross-http-downgrade.no-redirect.https.html
index 1288c7c6dc1..9214bb2f771 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation-import-data/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation-import-data/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation-import-data/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation-import-data/cross-https.downgrade.https.html
index 07c27fec3ba..799ba8f4948 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation-import-data/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation-import-data/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation-import-data/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation-import-data/same-http-downgrade.downgrade.https.html
index b7a12e0c4a6..c43defe6298 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation-import-data/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation-import-data/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation-import-data/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation-import-data/same-http-downgrade.no-redirect.https.html
index 5f27dc4d9fd..1ef76ad7be2 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation-import-data/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation-import-data/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation-import-data/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation-import-data/same-https.downgrade.https.html
index a0fa92bdb1e..f1d03735301 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation-import-data/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation-import-data/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation/cross-http-downgrade.downgrade.https.html
index fd35b79f023..e232edbac7c 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation/cross-http-downgrade.no-redirect.https.html
index ee34404899e..fb81b720d5a 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation/cross-https.downgrade.https.html
index db38f1489be..d74188cf455 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation/same-http-downgrade.downgrade.https.html
index 504cf09f305..50866e6e7ac 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation/same-http-downgrade.no-redirect.https.html
index 698a985ae20..1fb0f2e73e3 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation/same-https.downgrade.https.html
index 5d7e021e75f..d89c57becb6 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio-import-data/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio-import-data/cross-http-downgrade.downgrade.https.html
index d3a6c681dca..17020aa2259 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio-import-data/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio-import-data/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio-import-data/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio-import-data/cross-http-downgrade.no-redirect.https.html
index f50e00ed5b1..cbe51e460e2 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio-import-data/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio-import-data/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio-import-data/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio-import-data/cross-https.downgrade.https.html
index effd4a26783..7cf4fb049b7 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio-import-data/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio-import-data/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio-import-data/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio-import-data/same-http-downgrade.downgrade.https.html
index f19484bf012..948b6bf3412 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio-import-data/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio-import-data/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio-import-data/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio-import-data/same-http-downgrade.no-redirect.https.html
index db00900d101..65ab28b25ca 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio-import-data/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio-import-data/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio-import-data/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio-import-data/same-https.downgrade.https.html
index 706e439d4e8..1b47c22bb30 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio-import-data/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio-import-data/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio/cross-http-downgrade.downgrade.https.html
index 581cbcdf15a..5b36e1ac061 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio/cross-http-downgrade.no-redirect.https.html
index 1dfadd63828..d783f808f33 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio/cross-https.downgrade.https.html
index 9f56262b093..7b31f2af5a9 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio/same-http-downgrade.downgrade.https.html
index bcfec764a3d..f6c93b74547 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio/same-http-downgrade.no-redirect.https.html
index 71d5629dea5..ff00362e9cd 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio/same-https.downgrade.https.html
index ad67adad36f..f9069e28619 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout-import-data/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout-import-data/cross-http-downgrade.downgrade.https.html
index aa302dac6b6..94cd0ed19d6 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout-import-data/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout-import-data/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout-import-data/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout-import-data/cross-http-downgrade.no-redirect.https.html
index f108bdabe5e..af924c382dd 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout-import-data/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout-import-data/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout-import-data/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout-import-data/cross-https.downgrade.https.html
index 6b05e643809..263d468633c 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout-import-data/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout-import-data/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout-import-data/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout-import-data/same-http-downgrade.downgrade.https.html
index 6b5418df730..bbd703b54ed 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout-import-data/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout-import-data/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout-import-data/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout-import-data/same-http-downgrade.no-redirect.https.html
index 81c6958658c..505aaae5818 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout-import-data/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout-import-data/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout-import-data/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout-import-data/same-https.downgrade.https.html
index 29acc0eed4f..b0d058b778e 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout-import-data/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout-import-data/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout/cross-http-downgrade.downgrade.https.html
index 7fe4009758c..7696a89d426 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout/cross-http-downgrade.no-redirect.https.html
index 0a03c48db64..822edf5b094 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout/cross-https.downgrade.https.html
index 1d2c5933b51..bb9c6023e6b 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout/same-http-downgrade.downgrade.https.html
index b3ebc435c2d..c94b8ef959a 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout/same-http-downgrade.no-redirect.https.html
index 26279c5fae2..f51fdfba7d9 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout/same-https.downgrade.https.html
index 5e1a4ec9dec..4988c549b84 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint-import-data/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint-import-data/cross-http-downgrade.downgrade.https.html
index 46cee958840..fee2bb271ea 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint-import-data/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint-import-data/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint-import-data/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint-import-data/cross-http-downgrade.no-redirect.https.html
index b2b9bbd4b37..4217fdd0bc0 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint-import-data/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint-import-data/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint-import-data/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint-import-data/cross-https.downgrade.https.html
index e5dd3eb356b..f5a48ff475e 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint-import-data/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint-import-data/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint-import-data/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint-import-data/same-http-downgrade.downgrade.https.html
index 6c642903995..4a42bb7f9c2 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint-import-data/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint-import-data/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint-import-data/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint-import-data/same-http-downgrade.no-redirect.https.html
index 6ac8293bd67..27363a5d1f2 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint-import-data/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint-import-data/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint-import-data/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint-import-data/same-https.downgrade.https.html
index f17b252ee7d..a4f49c1931e 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint-import-data/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint-import-data/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint/cross-http-downgrade.downgrade.https.html
index 1df14a9ea24..6e2e81afc48 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint/cross-http-downgrade.no-redirect.https.html
index b2f2dbb52b4..57c7ec60835 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint/cross-https.downgrade.https.html
index 189232b3f88..f1100f23547 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint/same-http-downgrade.downgrade.https.html
index 8adac34f0db..4cf1a67d41e 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint/same-http-downgrade.no-redirect.https.html
index 91e1935963e..cfb87f8287e 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint/same-https.downgrade.https.html
index 79dd7c52201..022a8c81867 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/xhr/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/xhr/cross-http-downgrade.downgrade.https.html
index 15443fa2dd6..23a16e4af48 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/xhr/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/xhr/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/xhr/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/xhr/cross-http-downgrade.no-redirect.https.html
index d72acbf8a8a..a3300e50a11 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/xhr/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/xhr/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/xhr/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/xhr/cross-https.downgrade.https.html
index b22b35d9a37..7e3d77a8367 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/xhr/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/xhr/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/xhr/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/xhr/same-http-downgrade.downgrade.https.html
index e3a59677cb2..34fc7202332 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/xhr/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/xhr/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/xhr/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/xhr/same-http-downgrade.no-redirect.https.html
index dd4c6d88721..e0a92b68d06 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/xhr/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/xhr/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/xhr/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/xhr/same-https.downgrade.https.html
index 3068ecc85be..5c88d569669 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/xhr/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/xhr/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/cross-http-downgrade.downgrade.https.html
index 2a7790cc33c..6b2c0ad616c 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/cross-http-downgrade.no-redirect.https.html
index 6911881fcbf..ec3c8b92c4c 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/cross-https.downgrade.https.html
index bf18d02efa6..3a06038dc0f 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/same-http-downgrade.downgrade.https.html
index 5f031da8f22..d9bca219351 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/same-http-downgrade.no-redirect.https.html
index 63e6c10ba1c..2cb2510d985 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/same-https.downgrade.https.html
index 4769b3e4754..f138357a6fc 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/cross-http-downgrade.downgrade.https.html
index c8da091c477..92b9a4015d6 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/cross-http-downgrade.no-redirect.https.html
index 0ad59ebe503..c6117f3d772 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/cross-https.downgrade.https.html
index 128fe831b5d..add0d38ec9c 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/same-http-downgrade.downgrade.https.html
index d11fcf97344..f6cbe1da0da 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/same-http-downgrade.no-redirect.https.html
index 6032303cac0..dd12ac23184 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/same-https.downgrade.https.html
index 661356c3c16..c4b777f0f33 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/cross-http-downgrade.downgrade.https.html
index c412844dad3..9d71e02c9e3 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/cross-http-downgrade.no-redirect.https.html
index fff93a9e18e..809a31c35e3 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/cross-https.downgrade.https.html
index b63847a7cf0..206d906c4f4 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/same-http-downgrade.downgrade.https.html
index 5f53c2b0771..ec54a837fba 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/same-http-downgrade.no-redirect.https.html
index 0d890c4a527..668dbe9bd11 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/same-https.downgrade.https.html
index bfcb628c802..f5ecd77856d 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-classic/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-classic/same-http-downgrade.downgrade.https.html
index 9eccbf0123c..ec03696469d 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-classic/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-classic/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-classic/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-classic/same-http-downgrade.no-redirect.https.html
index 8e5ea4a7fe9..4cee4e76d9a 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-classic/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-classic/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-classic/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-classic/same-https.downgrade.https.html
index 470727e0625..d4ddc305d1f 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-classic/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-classic/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html
index 4a52dfc8881..123a25f7fb7 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/websocket/same-ws-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/websocket/same-ws-downgrade.no-redirect.https.html
index 805622a86d1..a2a7b193e6d 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/websocket/same-ws-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/websocket/same-ws-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-classic/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-classic/same-http-downgrade.downgrade.https.html
index 71761b8b1df..793f743023b 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-classic/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-classic/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-classic/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-classic/same-http-downgrade.no-redirect.https.html
index abd781bf1f4..8a39a3b4c38 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-classic/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-classic/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-classic/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-classic/same-https.downgrade.https.html
index 514ea385237..2c4a4d25a7c 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-classic/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-classic/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data/cross-http-downgrade.downgrade.https.html
index 3b56e7a799c..424b7595f94 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data/cross-http-downgrade.no-redirect.https.html
index 2d0474e0302..acc4563b1a9 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data/cross-https.downgrade.https.html
index 71353a3706b..3d2700d848c 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data/same-http-downgrade.downgrade.https.html
index 8490d9363fd..d649c4a5c42 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data/same-http-downgrade.no-redirect.https.html
index cf8591f88b1..88bba765402 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data/same-https.downgrade.https.html
index 9117f9435df..a425a01af91 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-module/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-module/same-http-downgrade.downgrade.https.html
index f01a9c0f218..82fe96a308e 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-module/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-module/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-module/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-module/same-http-downgrade.no-redirect.https.html
index 1f7b24ced6b..506eea2ff05 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-module/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-module/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-module/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-module/same-https.downgrade.https.html
index 4dda1d0f192..3bc32192216 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-module/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-module/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data/cross-http-downgrade.downgrade.https.html
index 668bde7a1d5..82c28b4a0c7 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data/cross-http-downgrade.no-redirect.https.html
index 6c940648537..e372fb761a5 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data/cross-https.downgrade.https.html
index 89a5aefe911..8b760745c71 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data/same-http-downgrade.downgrade.https.html
index 0cbf66c6db2..d970aff47f8 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data/same-http-downgrade.no-redirect.https.html
index 6e4e8abe309..6d4ae6a2e36 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data/same-https.downgrade.https.html
index ab1f02af206..ab61f3239a0 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation/cross-http-downgrade.downgrade.https.html
index 89607791547..23e397146ff 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation/cross-http-downgrade.no-redirect.https.html
index 49b7df1ceb2..4a763c292b5 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation/cross-https.downgrade.https.html
index 8e4b9233435..36794170c6a 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation/same-http-downgrade.downgrade.https.html
index d4a95355ffb..5b7798cdfc7 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation/same-http-downgrade.no-redirect.https.html
index a8c88f4b107..457f0ac8b5e 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation/same-https.downgrade.https.html
index 2f39bbb2fc5..6ca81ac3e9c 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data/cross-http-downgrade.downgrade.https.html
index 5f9500e2bcd..f64e2b5bd9f 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data/cross-http-downgrade.no-redirect.https.html
index 18cd96e8832..7019e56dccb 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data/cross-https.downgrade.https.html
index ba6ed32a1d2..1db825e09f0 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data/same-http-downgrade.downgrade.https.html
index 309dd782e17..bcb233b943b 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data/same-http-downgrade.no-redirect.https.html
index 12f598fce85..072dcf863ee 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data/same-https.downgrade.https.html
index 20c901c4326..69c44ac6a58 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio/cross-http-downgrade.downgrade.https.html
index 9b59f0ae60a..7dc69079e1d 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio/cross-http-downgrade.no-redirect.https.html
index feae96d10e4..64d386cbd43 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio/cross-https.downgrade.https.html
index 636ab9d72e3..68069cec7cd 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio/same-http-downgrade.downgrade.https.html
index bff934a9e3d..fe9618f929d 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio/same-http-downgrade.no-redirect.https.html
index 3d8d86aa251..b8534b5b809 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio/same-https.downgrade.https.html
index 5d78867856e..dfd4d450439 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data/cross-http-downgrade.downgrade.https.html
index cb0d12cc923..9737ddfc321 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data/cross-http-downgrade.no-redirect.https.html
index cddebab2984..86a314c5bf3 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data/cross-https.downgrade.https.html
index e4bd2b68869..63fb7f3c946 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data/same-http-downgrade.downgrade.https.html
index 34daf23396b..edc14448cd0 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data/same-http-downgrade.no-redirect.https.html
index 015697f4dcf..1322a7f4eea 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data/same-https.downgrade.https.html
index f7fca4405ba..dce5c13dd49 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout/cross-http-downgrade.downgrade.https.html
index 43617856af3..16d2f26ba93 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout/cross-http-downgrade.no-redirect.https.html
index 9c4a6131428..d2fca9c5f83 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout/cross-https.downgrade.https.html
index 771fa29ebc5..d2643919d60 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout/same-http-downgrade.downgrade.https.html
index 6aa3f6295e9..f8033e597fb 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout/same-http-downgrade.no-redirect.https.html
index 8190133d593..6cabd867072 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout/same-https.downgrade.https.html
index 32517465900..6052e366992 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data/cross-http-downgrade.downgrade.https.html
index d7c86b06c82..d7804cafa80 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data/cross-http-downgrade.no-redirect.https.html
index ca62ab79cae..663004027ea 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data/cross-https.downgrade.https.html
index d2378fcadf0..3154f627a89 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data/same-http-downgrade.downgrade.https.html
index 74b9a4a5401..f0a205fb940 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data/same-http-downgrade.no-redirect.https.html
index d94776fd03a..c7c2dee6bf3 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data/same-https.downgrade.https.html
index aa33297eaf3..2ce9ec2fe36 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint/cross-http-downgrade.downgrade.https.html
index 0619d470145..75c40dbd064 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint/cross-http-downgrade.no-redirect.https.html
index a91c13cfc8e..d725217913d 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint/cross-https.downgrade.https.html
index a1d28922a80..88c53734886 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint/same-http-downgrade.downgrade.https.html
index 56a8227d064..ba6c4ce273f 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint/same-http-downgrade.no-redirect.https.html
index 6c551a59e49..92f5b1aac21 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint/same-https.downgrade.https.html
index 41d1547c5b0..1aabb8d8df3 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr/cross-http-downgrade.downgrade.https.html
index 0278c5e7223..00ac29bc84e 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr/cross-http-downgrade.no-redirect.https.html
index cdacbb03338..a49ef623c53 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr/cross-https.downgrade.https.html
index 711b035f929..05bca54e30e 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr/same-http-downgrade.downgrade.https.html
index c3f5fc83fd3..471e943a3d0 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr/same-http-downgrade.no-redirect.https.html
index 234c639edfd..7eb1ffb0c79 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr/same-https.downgrade.https.html
index d926e88181c..269769f1806 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/fetch/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/fetch/cross-http-downgrade.downgrade.https.html
index fca4a5a70a9..67efa81dc42 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/fetch/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/fetch/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/fetch/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/fetch/cross-http-downgrade.no-redirect.https.html
index 25294d32722..83500403a68 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/fetch/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/fetch/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/fetch/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/fetch/cross-https.downgrade.https.html
index 5e8853d5e46..87f89f3d19f 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/fetch/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/fetch/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/fetch/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/fetch/same-http-downgrade.downgrade.https.html
index 4518ced5dcb..8905e773525 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/fetch/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/fetch/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/fetch/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/fetch/same-http-downgrade.no-redirect.https.html
index 2ad6b43f447..a5f2357d355 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/fetch/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/fetch/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/fetch/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/fetch/same-https.downgrade.https.html
index 6ed6f53c9d5..f41f7cacb73 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/fetch/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/fetch/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/iframe-tag/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/iframe-tag/cross-http-downgrade.downgrade.https.html
index 93dd9d9b7ca..2414d7ca26c 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/iframe-tag/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/iframe-tag/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/iframe-tag/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/iframe-tag/cross-http-downgrade.no-redirect.https.html
index 707c260eeec..a9eb72807d3 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/iframe-tag/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/iframe-tag/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/iframe-tag/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/iframe-tag/cross-https.downgrade.https.html
index 49a3a0d2c3f..cb7616f7256 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/iframe-tag/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/iframe-tag/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/iframe-tag/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/iframe-tag/same-http-downgrade.downgrade.https.html
index 7b308e355d0..fa4310e3f14 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/iframe-tag/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/iframe-tag/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/iframe-tag/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/iframe-tag/same-http-downgrade.no-redirect.https.html
index 84afe5cf7be..58c4519da75 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/iframe-tag/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/iframe-tag/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/iframe-tag/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/iframe-tag/same-https.downgrade.https.html
index e00d307b5d1..0168e00c65f 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/iframe-tag/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/iframe-tag/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/img-tag/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/img-tag/cross-http-downgrade.downgrade.https.html
index 8bcf5426b70..2cb08cb8ccb 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/img-tag/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/img-tag/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/img-tag/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/img-tag/cross-http-downgrade.no-redirect.https.html
index 8ca7ccb653e..812df4cc191 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/img-tag/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/img-tag/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/img-tag/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/img-tag/cross-https.downgrade.https.html
index caaefaee6b4..c01c4958738 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/img-tag/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/img-tag/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/img-tag/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/img-tag/same-http-downgrade.downgrade.https.html
index 61aca5a2593..c9adb7b6112 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/img-tag/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/img-tag/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/img-tag/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/img-tag/same-http-downgrade.no-redirect.https.html
index 3288cbe19da..d1352fdf554 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/img-tag/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/img-tag/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/img-tag/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/img-tag/same-https.downgrade.https.html
index 3c0208cb48b..30b3efe5420 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/img-tag/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/img-tag/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/sharedworker-classic/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/sharedworker-classic/same-http-downgrade.downgrade.https.html
index 67ae9a77415..071be8c6275 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/sharedworker-classic/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/sharedworker-classic/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/sharedworker-classic/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/sharedworker-classic/same-http-downgrade.no-redirect.https.html
index 71ca8334270..c7096af5ed8 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/sharedworker-classic/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/sharedworker-classic/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/sharedworker-classic/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/sharedworker-classic/same-https.downgrade.https.html
index 88826a8d440..3a1d79eafae 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/sharedworker-classic/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/sharedworker-classic/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/websocket/cross-ws-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/websocket/cross-ws-downgrade.no-redirect.https.html
index 123bc13d5db..77db067c646 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/websocket/cross-ws-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/websocket/cross-ws-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/websocket/same-ws-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/websocket/same-ws-downgrade.no-redirect.https.html
index a5bc2c88e7a..ca033331e18 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/websocket/same-ws-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/websocket/same-ws-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-classic/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-classic/same-http-downgrade.downgrade.https.html
index 075e9d535dd..34d1a7a784d 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-classic/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-classic/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-classic/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-classic/same-http-downgrade.no-redirect.https.html
index bec65611ee3..e4fc17ac1bd 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-classic/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-classic/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-classic/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-classic/same-https.downgrade.https.html
index d9bb535dfc4..8999ab8b9f7 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-classic/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-classic/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-import-data/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-import-data/cross-http-downgrade.downgrade.https.html
index bf16f45e0ea..2c7b37e3500 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-import-data/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-import-data/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-import-data/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-import-data/cross-http-downgrade.no-redirect.https.html
index 23ad04062ed..48f25895691 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-import-data/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-import-data/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-import-data/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-import-data/cross-https.downgrade.https.html
index c10b93bca3f..9abef9b1ac9 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-import-data/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-import-data/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-import-data/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-import-data/same-http-downgrade.downgrade.https.html
index b40c22fb675..c36e94d5c64 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-import-data/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-import-data/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-import-data/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-import-data/same-http-downgrade.no-redirect.https.html
index c13ca3414b9..a38c0dec0bb 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-import-data/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-import-data/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-import-data/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-import-data/same-https.downgrade.https.html
index e14ba510da1..15bab979046 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-import-data/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-import-data/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-module/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-module/same-http-downgrade.downgrade.https.html
index 3f313441729..a5886371401 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-module/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-module/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-module/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-module/same-http-downgrade.no-redirect.https.html
index fe106b20c74..3b773c72392 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-module/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-module/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-module/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-module/same-https.downgrade.https.html
index 0116fd8100e..17a6e6cd2f1 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-module/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-module/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation-import-data/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation-import-data/cross-http-downgrade.downgrade.https.html
index 41db74a8800..aae618993c6 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation-import-data/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation-import-data/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation-import-data/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation-import-data/cross-http-downgrade.no-redirect.https.html
index 48d95925fd0..022b2b2cc3d 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation-import-data/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation-import-data/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation-import-data/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation-import-data/cross-https.downgrade.https.html
index 9d32ee17331..7ebcd3afccd 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation-import-data/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation-import-data/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation-import-data/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation-import-data/same-http-downgrade.downgrade.https.html
index f16f22ced58..2209880dd9b 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation-import-data/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation-import-data/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation-import-data/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation-import-data/same-http-downgrade.no-redirect.https.html
index 9933d1ddd48..9c3a668b588 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation-import-data/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation-import-data/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation-import-data/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation-import-data/same-https.downgrade.https.html
index 09772048217..503f0d99e50 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation-import-data/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation-import-data/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation/cross-http-downgrade.downgrade.https.html
index 5da525d932d..402a59cfd69 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation/cross-http-downgrade.no-redirect.https.html
index 3391cc8abf2..518cbc31bf5 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation/cross-https.downgrade.https.html
index dedd21701fd..bfd5206b067 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation/same-http-downgrade.downgrade.https.html
index f07dad184a8..88ea4837873 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation/same-http-downgrade.no-redirect.https.html
index 61569fd8f8d..4a56f465125 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation/same-https.downgrade.https.html
index ace49d00b97..91e7912d584 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio-import-data/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio-import-data/cross-http-downgrade.downgrade.https.html
index c266298f0f8..20d573b29ca 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio-import-data/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio-import-data/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio-import-data/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio-import-data/cross-http-downgrade.no-redirect.https.html
index db6a1876b8c..a0925250e5e 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio-import-data/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio-import-data/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio-import-data/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio-import-data/cross-https.downgrade.https.html
index 1e1a8faf7e7..1154b7166ea 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio-import-data/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio-import-data/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio-import-data/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio-import-data/same-http-downgrade.downgrade.https.html
index fec20a09146..6910988ca2f 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio-import-data/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio-import-data/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio-import-data/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio-import-data/same-http-downgrade.no-redirect.https.html
index aef2b52cec3..efd4372812b 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio-import-data/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio-import-data/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio-import-data/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio-import-data/same-https.downgrade.https.html
index d358584ba79..1dc63d13cc6 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio-import-data/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio-import-data/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio/cross-http-downgrade.downgrade.https.html
index 3a6e93dfd35..794f83b3569 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio/cross-http-downgrade.no-redirect.https.html
index 47fd0a40725..5d0d822a01a 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio/cross-https.downgrade.https.html
index 67a22edca43..968b3f22eda 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio/same-http-downgrade.downgrade.https.html
index 055606e7862..d5a6774b4c5 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio/same-http-downgrade.no-redirect.https.html
index 34f1d7985be..a1772947a82 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio/same-https.downgrade.https.html
index 23707ba634e..d4b582e442e 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout-import-data/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout-import-data/cross-http-downgrade.downgrade.https.html
index 0b5cbe6fc76..e75284c16ab 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout-import-data/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout-import-data/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout-import-data/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout-import-data/cross-http-downgrade.no-redirect.https.html
index 7fa1f6e274c..2b6b0209938 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout-import-data/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout-import-data/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout-import-data/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout-import-data/cross-https.downgrade.https.html
index 40658efef37..fa7ee4d91c4 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout-import-data/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout-import-data/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout-import-data/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout-import-data/same-http-downgrade.downgrade.https.html
index 5a66689189a..367dd0492ac 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout-import-data/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout-import-data/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout-import-data/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout-import-data/same-http-downgrade.no-redirect.https.html
index 4b15e5512bb..104a41a4357 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout-import-data/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout-import-data/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout-import-data/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout-import-data/same-https.downgrade.https.html
index ca8c71f7a3b..110c4c25b19 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout-import-data/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout-import-data/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout/cross-http-downgrade.downgrade.https.html
index 6ee26e108d1..9e8487938f0 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout/cross-http-downgrade.no-redirect.https.html
index 08ae852dad8..70762bc3cec 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout/cross-https.downgrade.https.html
index 669fadbc9fb..72244a8af0d 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout/same-http-downgrade.downgrade.https.html
index 751ff7e4eda..11a5abb8e4e 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout/same-http-downgrade.no-redirect.https.html
index 3867169380d..82326136f0d 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout/same-https.downgrade.https.html
index 6986a787434..b8e2694cb77 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint-import-data/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint-import-data/cross-http-downgrade.downgrade.https.html
index a29f6209b07..6f6c1f90cc5 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint-import-data/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint-import-data/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint-import-data/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint-import-data/cross-http-downgrade.no-redirect.https.html
index 93383d5b623..30aa9210970 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint-import-data/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint-import-data/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint-import-data/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint-import-data/cross-https.downgrade.https.html
index 346bb6b9fa3..7cf00d3c786 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint-import-data/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint-import-data/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint-import-data/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint-import-data/same-http-downgrade.downgrade.https.html
index 869fc00080d..7e1946dcda5 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint-import-data/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint-import-data/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint-import-data/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint-import-data/same-http-downgrade.no-redirect.https.html
index 542c18337a5..663dc0fb4ae 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint-import-data/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint-import-data/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint-import-data/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint-import-data/same-https.downgrade.https.html
index eba63c36922..0b4765bc2ac 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint-import-data/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint-import-data/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint/cross-http-downgrade.downgrade.https.html
index 1dc5f081122..41cb8a69766 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint/cross-http-downgrade.no-redirect.https.html
index 01a84d602d4..08342983281 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint/cross-https.downgrade.https.html
index 8589ff6bc2d..b1bb99468ec 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint/same-http-downgrade.downgrade.https.html
index 30314fc606d..e3502179c9c 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint/same-http-downgrade.no-redirect.https.html
index daa420b357f..df54f05e0b0 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint/same-https.downgrade.https.html
index 383f42ed912..5e8dc0759fb 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/xhr/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/xhr/cross-http-downgrade.downgrade.https.html
index beae338c562..98f66961c18 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/xhr/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/xhr/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/xhr/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/xhr/cross-http-downgrade.no-redirect.https.html
index 685ebe40100..a9955b4f9cb 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/xhr/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/xhr/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/xhr/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/xhr/cross-https.downgrade.https.html
index 4bbfd75744a..506b71efff0 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/xhr/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/xhr/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/xhr/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/xhr/same-http-downgrade.downgrade.https.html
index cb5cc3a476f..1ef6a56d3eb 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/xhr/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/xhr/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/xhr/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/xhr/same-http-downgrade.no-redirect.https.html
index a5325b32569..b57e26b855f 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/xhr/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/xhr/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/xhr/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/xhr/same-https.downgrade.https.html
index cfe86148a25..8758bd12df9 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/xhr/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/xhr/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/fetch/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/fetch/cross-http-downgrade.downgrade.https.html
index f9750e1a372..2138d47f981 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/fetch/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/fetch/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/fetch/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/fetch/cross-http-downgrade.no-redirect.https.html
index 3b08b721e87..0549df7f3bb 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/fetch/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/fetch/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/fetch/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/fetch/cross-https.downgrade.https.html
index 8d0a80ab817..2756e62b482 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/fetch/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/fetch/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/fetch/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/fetch/same-http-downgrade.downgrade.https.html
index d5ebb857f6a..9ecd3eda7d1 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/fetch/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/fetch/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/fetch/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/fetch/same-http-downgrade.no-redirect.https.html
index 5d6d8f5c4e5..6339cb769b9 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/fetch/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/fetch/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/fetch/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/fetch/same-https.downgrade.https.html
index 63b5c8c505a..c36c0d188eb 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/fetch/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/fetch/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/iframe-tag/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/iframe-tag/cross-http-downgrade.downgrade.https.html
index 09be76409e4..1dd755c5514 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/iframe-tag/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/iframe-tag/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/iframe-tag/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/iframe-tag/cross-http-downgrade.no-redirect.https.html
index e86f7531ad5..ab3f5a2e569 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/iframe-tag/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/iframe-tag/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/iframe-tag/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/iframe-tag/cross-https.downgrade.https.html
index 4f2e231419f..a9c65e84fbb 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/iframe-tag/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/iframe-tag/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/iframe-tag/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/iframe-tag/same-http-downgrade.downgrade.https.html
index 86958e9db78..d4546625679 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/iframe-tag/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/iframe-tag/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/iframe-tag/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/iframe-tag/same-http-downgrade.no-redirect.https.html
index 70507d39d8d..79ab70738c0 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/iframe-tag/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/iframe-tag/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/iframe-tag/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/iframe-tag/same-https.downgrade.https.html
index 71764a1f149..b0cfe5bbff3 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/iframe-tag/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/iframe-tag/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/img-tag/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/img-tag/cross-http-downgrade.downgrade.https.html
index c0c141a692b..aa674cadd34 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/img-tag/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/img-tag/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/img-tag/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/img-tag/cross-http-downgrade.no-redirect.https.html
index baef52df2fb..16e6ac52c36 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/img-tag/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/img-tag/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/img-tag/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/img-tag/cross-https.downgrade.https.html
index 25f2948fe78..9eedc83dbb1 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/img-tag/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/img-tag/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/img-tag/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/img-tag/same-http-downgrade.downgrade.https.html
index ab649803004..66f477d68a7 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/img-tag/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/img-tag/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/img-tag/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/img-tag/same-http-downgrade.no-redirect.https.html
index 066d34cfe73..bb832d5d426 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/img-tag/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/img-tag/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/img-tag/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/img-tag/same-https.downgrade.https.html
index 073a0ae880d..87a03bb7845 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/img-tag/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/img-tag/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/sharedworker-classic/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/sharedworker-classic/same-http-downgrade.downgrade.https.html
index 00cd0d4698c..190e37fe257 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/sharedworker-classic/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/sharedworker-classic/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/sharedworker-classic/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/sharedworker-classic/same-http-downgrade.no-redirect.https.html
index 5d0e23e6c1b..78b431bf6ed 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/sharedworker-classic/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/sharedworker-classic/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/sharedworker-classic/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/sharedworker-classic/same-https.downgrade.https.html
index 08bf866c4df..22fffb7e65d 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/sharedworker-classic/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/sharedworker-classic/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html
index 8858a097638..65f84d20c67 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/websocket/same-ws-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/websocket/same-ws-downgrade.no-redirect.https.html
index dfebfd1e5f5..dd559d15752 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/websocket/same-ws-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/websocket/same-ws-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-classic/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-classic/same-http-downgrade.downgrade.https.html
index 344837e8b2f..a460071f080 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-classic/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-classic/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-classic/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-classic/same-http-downgrade.no-redirect.https.html
index cf36e0183b8..26fe5b4e68a 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-classic/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-classic/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-classic/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-classic/same-https.downgrade.https.html
index 7b863f63d8b..fef4c2b34ce 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-classic/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-classic/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-import-data/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-import-data/cross-http-downgrade.downgrade.https.html
index 52c9277442a..03d1b998705 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-import-data/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-import-data/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-import-data/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-import-data/cross-http-downgrade.no-redirect.https.html
index 81a16de6a24..ff5f284a742 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-import-data/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-import-data/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-import-data/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-import-data/cross-https.downgrade.https.html
index 94ffe6cc32b..cf8c9f48598 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-import-data/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-import-data/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-import-data/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-import-data/same-http-downgrade.downgrade.https.html
index c83cb3af929..04a459cbc21 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-import-data/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-import-data/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-import-data/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-import-data/same-http-downgrade.no-redirect.https.html
index 26eb2051ee3..152ae93b54e 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-import-data/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-import-data/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-import-data/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-import-data/same-https.downgrade.https.html
index 18316c62cfe..23ebc58fa51 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-import-data/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-import-data/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-module/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-module/same-http-downgrade.downgrade.https.html
index e86ab02cd87..24fbc562fbd 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-module/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-module/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-module/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-module/same-http-downgrade.no-redirect.https.html
index d671b9d4c33..d65b8ec7e79 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-module/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-module/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-module/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-module/same-https.downgrade.https.html
index 7441428075f..17c17fa82b0 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-module/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-module/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation-import-data/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation-import-data/cross-http-downgrade.downgrade.https.html
index b81d616b9c7..537db7e735a 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation-import-data/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation-import-data/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation-import-data/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation-import-data/cross-http-downgrade.no-redirect.https.html
index e24be56b7be..63242d0a0be 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation-import-data/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation-import-data/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation-import-data/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation-import-data/cross-https.downgrade.https.html
index 5783bb8986d..eafb6c1e2dd 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation-import-data/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation-import-data/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation-import-data/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation-import-data/same-http-downgrade.downgrade.https.html
index fad7c7c68a1..033297a088e 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation-import-data/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation-import-data/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation-import-data/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation-import-data/same-http-downgrade.no-redirect.https.html
index fb7fa4d8639..468ec100c7b 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation-import-data/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation-import-data/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation-import-data/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation-import-data/same-https.downgrade.https.html
index 6c340d99ddd..007d9ad0e09 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation-import-data/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation-import-data/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation/cross-http-downgrade.downgrade.https.html
index e01c62a2781..2aa5e96edb8 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation/cross-http-downgrade.no-redirect.https.html
index 35507477de1..2841b991bbd 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation/cross-https.downgrade.https.html
index ca0d0e6a08f..b8fcfc4e14e 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation/same-http-downgrade.downgrade.https.html
index 49557f2c613..3aea026d811 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation/same-http-downgrade.no-redirect.https.html
index 3fd3641af40..a6a1a5d3c9b 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation/same-https.downgrade.https.html
index 02b1038cedb..f84d2eb2000 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio-import-data/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio-import-data/cross-http-downgrade.downgrade.https.html
index 8c17faf68af..de18eee7b13 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio-import-data/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio-import-data/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio-import-data/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio-import-data/cross-http-downgrade.no-redirect.https.html
index 415ca3d7476..a6d61ca4c80 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio-import-data/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio-import-data/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio-import-data/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio-import-data/cross-https.downgrade.https.html
index d36faebf09f..078155b576f 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio-import-data/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio-import-data/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio-import-data/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio-import-data/same-http-downgrade.downgrade.https.html
index 329b41e2c20..3f3cc573475 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio-import-data/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio-import-data/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio-import-data/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio-import-data/same-http-downgrade.no-redirect.https.html
index 09f9a35167e..5ffee9e3fd0 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio-import-data/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio-import-data/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio-import-data/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio-import-data/same-https.downgrade.https.html
index 5face3b0f1a..aac6bdce776 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio-import-data/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio-import-data/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio/cross-http-downgrade.downgrade.https.html
index 5ca6b71935a..6e3b86a24a7 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio/cross-http-downgrade.no-redirect.https.html
index 9addf82ae12..ccb6f571221 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio/cross-https.downgrade.https.html
index 00228ef7fdc..7a4a31363b8 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio/same-http-downgrade.downgrade.https.html
index 000ce5e3cd1..e1901a495bb 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio/same-http-downgrade.no-redirect.https.html
index 5216ccbaa2d..3ca933fd7e5 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio/same-https.downgrade.https.html
index 464b8d5725b..bcf8c88644b 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout-import-data/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout-import-data/cross-http-downgrade.downgrade.https.html
index 369e5191605..413ce2f06e7 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout-import-data/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout-import-data/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout-import-data/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout-import-data/cross-http-downgrade.no-redirect.https.html
index cb97e532d29..c3842d2a94c 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout-import-data/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout-import-data/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout-import-data/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout-import-data/cross-https.downgrade.https.html
index d7706cc6ab8..864b2faa8d0 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout-import-data/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout-import-data/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout-import-data/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout-import-data/same-http-downgrade.downgrade.https.html
index 7b490061551..755b4c94095 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout-import-data/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout-import-data/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout-import-data/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout-import-data/same-http-downgrade.no-redirect.https.html
index 18995bd3014..91499ff9758 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout-import-data/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout-import-data/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout-import-data/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout-import-data/same-https.downgrade.https.html
index 6b8c53a94d1..34007608fd9 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout-import-data/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout-import-data/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout/cross-http-downgrade.downgrade.https.html
index 8acdd3caac2..9bb3f8ff3d2 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout/cross-http-downgrade.no-redirect.https.html
index 26167e177bd..d5a4f4fbaee 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout/cross-https.downgrade.https.html
index 13ef09cb388..d3edb0a6dfa 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout/same-http-downgrade.downgrade.https.html
index cc56f51c2de..cb642c6fc32 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout/same-http-downgrade.no-redirect.https.html
index 7b622c2f2cb..585677ac948 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout/same-https.downgrade.https.html
index 2ce3df1cc9c..e828b3e1584 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint-import-data/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint-import-data/cross-http-downgrade.downgrade.https.html
index 7516c16b4e3..f9feb9989c4 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint-import-data/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint-import-data/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint-import-data/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint-import-data/cross-http-downgrade.no-redirect.https.html
index 404386e58bb..d6d7f1704fd 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint-import-data/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint-import-data/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint-import-data/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint-import-data/cross-https.downgrade.https.html
index 53b77d6908c..423363e0daf 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint-import-data/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint-import-data/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint-import-data/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint-import-data/same-http-downgrade.downgrade.https.html
index 69d4741f47a..ea033c48ff9 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint-import-data/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint-import-data/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint-import-data/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint-import-data/same-http-downgrade.no-redirect.https.html
index 9a1585db551..a00354d64e8 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint-import-data/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint-import-data/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint-import-data/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint-import-data/same-https.downgrade.https.html
index da6197fc139..99b2a02802a 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint-import-data/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint-import-data/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint/cross-http-downgrade.downgrade.https.html
index ab1c859bae2..c2f8529daa1 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint/cross-http-downgrade.no-redirect.https.html
index 937aaaa8a67..138d0e8bee8 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint/cross-https.downgrade.https.html
index 99e10720636..418245506ec 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint/same-http-downgrade.downgrade.https.html
index 1d152f66d07..107797df582 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint/same-http-downgrade.no-redirect.https.html
index d6babfe45e2..79523a19211 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint/same-https.downgrade.https.html
index a0c28b0701f..9768f6d84dc 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/xhr/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/xhr/cross-http-downgrade.downgrade.https.html
index 9c7776e6347..3567cc99e99 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/xhr/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/xhr/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/xhr/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/xhr/cross-http-downgrade.no-redirect.https.html
index 8300d8fa67b..a482929b9df 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/xhr/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/xhr/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/xhr/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/xhr/cross-https.downgrade.https.html
index 96e7c41dba9..fd7f6987d73 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/xhr/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/xhr/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/xhr/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/xhr/same-http-downgrade.downgrade.https.html
index 146599f5a89..1d5958d6d79 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/xhr/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/xhr/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/xhr/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/xhr/same-http-downgrade.no-redirect.https.html
index eb6c5689b94..a33232890b5 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/xhr/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/xhr/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/xhr/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/xhr/same-https.downgrade.https.html
index 2fe37dbe342..d7d0438c6a5 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/xhr/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/xhr/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/fetch/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/fetch/cross-http-downgrade.downgrade.https.html
index e24fc083802..dd685a04513 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/fetch/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/fetch/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/fetch/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/fetch/cross-http-downgrade.no-redirect.https.html
index b065f136482..9439de7dbfc 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/fetch/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/fetch/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/fetch/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/fetch/cross-https.downgrade.https.html
index 6ef001bf515..06309cfb9e1 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/fetch/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/fetch/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/fetch/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/fetch/same-http-downgrade.downgrade.https.html
index c236aa3db57..d6658f06b30 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/fetch/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/fetch/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/fetch/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/fetch/same-http-downgrade.no-redirect.https.html
index ba07fe78d97..067ea1da492 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/fetch/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/fetch/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/fetch/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/fetch/same-https.downgrade.https.html
index 04fb348c48d..57b1b0f7cda 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/fetch/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/fetch/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/websocket/cross-ws-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/websocket/cross-ws-downgrade.no-redirect.https.html
index 85b2a842e25..5040b9608b5 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/websocket/cross-ws-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/websocket/cross-ws-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/websocket/same-ws-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/websocket/same-ws-downgrade.no-redirect.https.html
index 47a6635e111..c1ef17487ca 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/websocket/same-ws-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/websocket/same-ws-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/xhr/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/xhr/cross-http-downgrade.downgrade.https.html
index 53c56a1f859..dc7a3a59426 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/xhr/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/xhr/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/xhr/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/xhr/cross-http-downgrade.no-redirect.https.html
index b4b9b6f8031..b1c00ebe520 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/xhr/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/xhr/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/xhr/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/xhr/cross-https.downgrade.https.html
index 4a92b5e4701..0ede5561131 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/xhr/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/xhr/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/xhr/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/xhr/same-http-downgrade.downgrade.https.html
index 0bb47da9c3f..103199ae6a6 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/xhr/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/xhr/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/xhr/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/xhr/same-http-downgrade.no-redirect.https.html
index 4a7ea8a72f0..875fac335fc 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/xhr/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/xhr/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/xhr/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/xhr/same-https.downgrade.https.html
index 67d232b65ee..917e6f0b6fb 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/xhr/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/xhr/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: No upgrade-insecure-request</title>
@@ -11,7 +11,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/fetch/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/fetch/cross-http-downgrade.downgrade.https.html
index 30a09597404..93ff7111e8f 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/fetch/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/fetch/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/fetch/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/fetch/cross-http-downgrade.no-redirect.https.html
index c726a18a6d6..68bba09e56e 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/fetch/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/fetch/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/fetch/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/fetch/cross-https.downgrade.https.html
index 8d273ac65d1..b06493d43d2 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/fetch/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/fetch/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/fetch/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/fetch/same-http-downgrade.downgrade.https.html
index 8c50860d2a9..bb0cb7b84d5 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/fetch/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/fetch/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/fetch/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/fetch/same-http-downgrade.no-redirect.https.html
index 364e95b3c1c..bfaca7ed201 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/fetch/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/fetch/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/fetch/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/fetch/same-https.downgrade.https.html
index f07d94db67b..d5102270e7c 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/fetch/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/fetch/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html
index fa6232d958c..ff912b7c91e 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/websocket/cross-ws-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/websocket/same-ws-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/websocket/same-ws-downgrade.no-redirect.https.html
index 2da6643940e..5ee233704d3 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/websocket/same-ws-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/websocket/same-ws-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/xhr/cross-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/xhr/cross-http-downgrade.downgrade.https.html
index 46518de4a6b..8981c9056bc 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/xhr/cross-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/xhr/cross-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/xhr/cross-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/xhr/cross-http-downgrade.no-redirect.https.html
index 3e8fe269f20..8fa26126674 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/xhr/cross-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/xhr/cross-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/xhr/cross-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/xhr/cross-https.downgrade.https.html
index 4c2853f9e3a..f945ca10154 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/xhr/cross-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/xhr/cross-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/xhr/same-http-downgrade.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/xhr/same-http-downgrade.downgrade.https.html
index e3dbf9fb3ac..0ef614a96dd 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/xhr/same-http-downgrade.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/xhr/same-http-downgrade.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/xhr/same-http-downgrade.no-redirect.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/xhr/same-http-downgrade.no-redirect.https.html
index 002ed403c7f..9a57842a9ef 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/xhr/same-http-downgrade.no-redirect.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/xhr/same-http-downgrade.no-redirect.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/xhr/same-https.downgrade.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/xhr/same-https.downgrade.https.html
index 43c8dcf97b3..e993c3abbcb 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/xhr/same-https.downgrade.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/xhr/same-https.downgrade.https.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by upgrade-insecure-requests/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
 <html>
   <head>
     <title>Upgrade-Insecure-Requests: With upgrade-insecure-request</title>
@@ -12,7 +12,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/upgrade-insecure-requests/generic/test-case.sub.js"></script>
+    <script src="../../../../generic/test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/generic/spec_json.js b/tests/wpt/web-platform-tests/upgrade-insecure-requests/generic/spec_json.js
index 89b17048e22..822afa11397 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/generic/spec_json.js
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/generic/spec_json.js
@@ -1 +1 @@
-var SPEC_JSON = {"subresource_schema": {"supported_delivery_type": {"worklet-layout": [], "worklet-paint": [], "worker-module": [], "sharedworker-classic": [], "worklet-paint-import-data": [], "worklet-animation-import-data": [], "fetch": [], "xhr": [], "worker-classic": [], "worklet-layout-import-data": [], "worklet-audio-import-data": [], "worklet-animation": [], "worker-import-data": [], "websocket": [], "worklet-audio": [], "iframe-tag": [], "img-tag": []}}, "source_context_list_schema": {"worker-classic-data": {"subresourcePolicyDeliveries": [], "description": "CSP set by the top-level Document is inherited to dedicated workers", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "worker-classic-data", "policyDeliveries": []}]}, "top": {"subresourcePolicyDeliveries": [], "description": "CSP set by the top-level Document", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}]}, "srcdoc-inherit": {"subresourcePolicyDeliveries": [], "description": "srcdoc iframe should inherit parent Document's policy", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "srcdoc"}]}, "iframe-blank-inherit": {"subresourcePolicyDeliveries": [], "description": "blank iframe should inherit parent Document's policy", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "iframe-blank"}]}}, "test_page_title_template": "Upgrade-Insecure-Requests: %(title)s", "test_expansion_schema": {"delivery_value": [null, "upgrade"], "origin": ["same-https", "same-http-downgrade", "cross-https", "cross-http-downgrade", "same-wss", "same-ws-downgrade", "cross-wss", "cross-ws-downgrade"], "delivery_type": ["http-rp", "meta"], "subresource": ["iframe-tag", "img-tag", "xhr", "fetch", "websocket", "worker-classic", "worker-module", "worker-import-data", "sharedworker-classic", "worklet-animation", "worklet-audio", "worklet-layout", "worklet-paint", "worklet-animation-import-data", "worklet-audio-import-data", "worklet-layout-import-data", "worklet-paint-import-data"], "expectation": ["allowed", "blocked"], "expansion": ["default", "override"], "redirection": ["no-redirect", "downgrade"], "source_context_list": ["top", "srcdoc-inherit", "iframe-blank-inherit", "worker-classic-data"], "source_scheme": ["https"]}, "selection_pattern": "%(source_context_list)s.%(delivery_type)s/%(delivery_value)s/%(subresource)s/%(origin)s.%(redirection)s.%(source_scheme)s", "specification": [{"test_expansion": [{"delivery_value": null, "origin": "*", "delivery_type": "meta", "name": "Without upgrade-insecure-request, all requests are blocked ...", "expectation": "blocked", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "https", "subresource": "*"}, {"delivery_value": null, "origin": ["same-https", "cross-https", "same-wss", "cross-wss"], "delivery_type": "meta", "name": "... except for the secure requests listed here", "expectation": "allowed", "expansion": "override", "redirection": "no-redirect", "source_context_list": "*", "source_scheme": "https", "subresource": "*"}], "description": "No upgrade-insecure-request", "specification_url": "https://w3c.github.io/webappsec-upgrade-insecure-requests/", "name": "No upgrade-insecure-request", "title": "No upgrade-insecure-request"}, {"test_expansion": [{"delivery_value": "upgrade", "origin": "*", "delivery_type": "*", "name": "With upgrade-insecure-request, all insecure requests are upgraded and allowed.", "expectation": "allowed", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "https", "subresource": "*"}], "description": "With upgrade-insecure-request", "specification_url": "https://w3c.github.io/webappsec-upgrade-insecure-requests/", "name": "With upgrade-insecure-request", "title": "With upgrade-insecure-request"}], "test_file_path_pattern": "gen/%(source_context_list)s.%(delivery_type)s/%(delivery_value)s/%(subresource)s/%(origin)s.%(redirection)s.%(source_scheme)s.html", "excluded_tests": [{"delivery_value": "*", "origin": ["same-https", "cross-https", "same-wss", "cross-wss"], "delivery_type": "*", "name": "Omit secure requests", "expectation": "allowed", "expansion": "*", "redirection": "no-redirect", "source_context_list": "*", "source_scheme": "*", "subresource": "*"}, {"delivery_value": "*", "origin": "*", "delivery_type": "http-rp", "name": "For inheriting tests skip http-rp because we already have <meta> tests", "expectation": "*", "expansion": "*", "redirection": "*", "source_context_list": ["srcdoc-inherit", "iframe-blank-inherit", "worker-classic-data"], "source_scheme": "*", "subresource": "*"}, {"delivery_value": "*", "origin": ["cross-https", "cross-http-downgrade", "cross-wss", "cross-ws-downgrade"], "delivery_type": "*", "name": "Workers are same-origin only", "expectation": "*", "expansion": "*", "redirection": "*", "source_context_list": "*", "source_scheme": "*", "subresource": ["worker-classic", "worker-module", "sharedworker-classic"]}, {"delivery_value": "*", "origin": ["same-https", "same-http-downgrade", "cross-https", "cross-http-downgrade"], "delivery_type": "*", "name": "Websockets are ws/wss-only", "expectation": "*", "expansion": "*", "redirection": "*", "source_context_list": "*", "source_scheme": "*", "subresource": "websocket"}, {"delivery_value": "*", "origin": "*", "delivery_type": "*", "name": "Websockets is no-redirect only", "expectation": "*", "expansion": "*", "redirection": ["downgrade"], "source_context_list": "*", "source_scheme": "*", "subresource": "websocket"}, {"delivery_value": "*", "origin": ["same-wss", "same-ws-downgrade", "cross-wss", "cross-ws-downgrade"], "delivery_type": "*", "name": "ws/wss are websocket-only", "expectation": "*", "expansion": "*", "redirection": "*", "source_context_list": "*", "source_scheme": "*", "subresource": ["iframe-tag", "img-tag", "xhr", "fetch", "worker-classic", "worker-module", "worker-import-data", "sharedworker-classic", "worklet-animation", "worklet-audio", "worklet-layout", "worklet-paint", "worklet-animation-import-data", "worklet-audio-import-data", "worklet-layout-import-data", "worklet-paint-import-data"]}], "delivery_key": "upgradeInsecureRequests", "test_description_template": "Upgrade-Insecure-Requests: Expects %(expectation)s for %(subresource)s to %(origin)s origin and %(redirection)s redirection from %(source_scheme)s context.", "source_context_schema": {"supported_delivery_type": {"iframe": ["http-rp", "meta"], "worker-module-data": [], "worker-classic-data": [], "top": ["http-rp", "meta"], "worker-classic": ["http-rp"], "iframe-blank": ["meta"], "worker-module": ["http-rp"], "srcdoc": ["meta"]}, "supported_subresource": {"iframe": "*", "worker-module-data": ["xhr", "fetch", "websocket"], "worker-classic-data": ["xhr", "fetch", "websocket"], "top": "*", "worker-classic": ["xhr", "fetch", "websocket"], "iframe-blank": "*", "worker-module": ["xhr", "fetch", "websocket"], "srcdoc": "*"}}};
+var SPEC_JSON = {"selection_pattern": "%(source_context_list)s.%(delivery_type)s/%(delivery_value)s/%(subresource)s/%(origin)s.%(redirection)s.%(source_scheme)s", "test_file_path_pattern": "gen/%(source_context_list)s.%(delivery_type)s/%(delivery_value)s/%(subresource)s/%(origin)s.%(redirection)s.%(source_scheme)s.html", "test_description_template": "Upgrade-Insecure-Requests: Expects %(expectation)s for %(subresource)s to %(origin)s origin and %(redirection)s redirection from %(source_scheme)s context.", "test_page_title_template": "Upgrade-Insecure-Requests: %(title)s", "specification": [{"name": "No upgrade-insecure-request", "title": "No upgrade-insecure-request", "description": "No upgrade-insecure-request", "specification_url": "https://w3c.github.io/webappsec-upgrade-insecure-requests/", "test_expansion": [{"name": "Without upgrade-insecure-request, all requests are blocked ...", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "meta", "delivery_value": null, "redirection": "*", "subresource": "*", "origin": "*", "expectation": "blocked"}, {"name": "... except for the secure requests listed here", "expansion": "override", "source_scheme": "https", "source_context_list": "*", "delivery_type": "meta", "delivery_value": null, "redirection": "no-redirect", "subresource": "*", "origin": ["same-https", "cross-https", "same-wss", "cross-wss"], "expectation": "allowed"}]}, {"name": "With upgrade-insecure-request", "title": "With upgrade-insecure-request", "description": "With upgrade-insecure-request", "specification_url": "https://w3c.github.io/webappsec-upgrade-insecure-requests/", "test_expansion": [{"name": "With upgrade-insecure-request, all insecure requests are upgraded and allowed.", "expansion": "default", "source_scheme": "https", "source_context_list": "*", "delivery_type": "*", "delivery_value": "upgrade", "redirection": "*", "subresource": "*", "origin": "*", "expectation": "allowed"}]}], "delivery_key": "upgradeInsecureRequests", "excluded_tests": [{"name": "Omit secure requests", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": "no-redirect", "subresource": "*", "origin": ["same-https", "cross-https", "same-wss", "cross-wss"], "expectation": "allowed"}, {"name": "For inheriting tests skip http-rp because we already have <meta> tests", "expansion": "*", "source_scheme": "*", "source_context_list": ["srcdoc-inherit", "iframe-blank-inherit", "worker-classic-data"], "delivery_type": "http-rp", "delivery_value": "*", "redirection": "*", "subresource": "*", "origin": "*", "expectation": "*"}, {"name": "Workers are same-origin only", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": "*", "subresource": ["worker-classic", "worker-module", "sharedworker-classic"], "origin": ["cross-https", "cross-http-downgrade", "cross-wss", "cross-ws-downgrade"], "expectation": "*"}, {"name": "Websockets are ws/wss-only", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": "*", "subresource": "websocket", "origin": ["same-https", "same-http-downgrade", "cross-https", "cross-http-downgrade"], "expectation": "*"}, {"name": "Websockets is no-redirect only", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": ["downgrade"], "subresource": "websocket", "origin": "*", "expectation": "*"}, {"name": "ws/wss are websocket-only", "expansion": "*", "source_scheme": "*", "source_context_list": "*", "delivery_type": "*", "delivery_value": "*", "redirection": "*", "subresource": ["iframe-tag", "img-tag", "xhr", "fetch", "worker-classic", "worker-module", "worker-import-data", "sharedworker-classic", "worklet-animation", "worklet-audio", "worklet-layout", "worklet-paint", "worklet-animation-import-data", "worklet-audio-import-data", "worklet-layout-import-data", "worklet-paint-import-data"], "origin": ["same-wss", "same-ws-downgrade", "cross-wss", "cross-ws-downgrade"], "expectation": "*"}], "source_context_schema": {"supported_delivery_type": {"top": ["http-rp", "meta"], "iframe": ["http-rp", "meta"], "iframe-blank": ["meta"], "srcdoc": ["meta"], "worker-classic": ["http-rp"], "worker-module": ["http-rp"], "worker-classic-data": [], "worker-module-data": []}, "supported_subresource": {"top": "*", "iframe": "*", "iframe-blank": "*", "srcdoc": "*", "worker-classic": ["xhr", "fetch", "websocket"], "worker-module": ["xhr", "fetch", "websocket"], "worker-classic-data": ["xhr", "fetch", "websocket"], "worker-module-data": ["xhr", "fetch", "websocket"]}}, "subresource_schema": {"supported_delivery_type": {"xhr": [], "worker-classic": [], "worker-module": [], "worker-import-data": [], "sharedworker-classic": [], "worklet-animation": [], "worklet-audio": [], "worklet-layout": [], "worklet-paint": [], "worklet-animation-import-data": [], "worklet-audio-import-data": [], "worklet-layout-import-data": [], "worklet-paint-import-data": [], "fetch": [], "websocket": [], "img-tag": [], "iframe-tag": []}}, "source_context_list_schema": {"top": {"description": "CSP set by the top-level Document", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}], "subresourcePolicyDeliveries": []}, "srcdoc-inherit": {"description": "srcdoc iframe should inherit parent Document's policy", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "srcdoc"}], "subresourcePolicyDeliveries": []}, "iframe-blank-inherit": {"description": "blank iframe should inherit parent Document's policy", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "iframe-blank"}], "subresourcePolicyDeliveries": []}, "worker-classic-data": {"description": "CSP set by the top-level Document is inherited to dedicated workers", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "worker-classic-data", "policyDeliveries": []}], "subresourcePolicyDeliveries": []}}, "test_expansion_schema": {"expansion": ["default", "override"], "source_scheme": ["https"], "delivery_type": ["http-rp", "meta"], "delivery_value": [null, "upgrade"], "source_context_list": ["top", "srcdoc-inherit", "iframe-blank-inherit", "worker-classic-data"], "redirection": ["no-redirect", "downgrade"], "origin": ["same-https", "same-http-downgrade", "cross-https", "cross-http-downgrade", "same-wss", "same-ws-downgrade", "cross-wss", "cross-ws-downgrade"], "subresource": ["iframe-tag", "img-tag", "xhr", "fetch", "websocket", "worker-classic", "worker-module", "worker-import-data", "sharedworker-classic", "worklet-animation", "worklet-audio", "worklet-layout", "worklet-paint", "worklet-animation-import-data", "worklet-audio-import-data", "worklet-layout-import-data", "worklet-paint-import-data"], "expectation": ["allowed", "blocked"]}};
diff --git a/tests/wpt/web-platform-tests/web-nfc/NDEFRecord_constructor.https.html b/tests/wpt/web-platform-tests/web-nfc/NDEFRecord_constructor.https.html
index ef38a27a050..a2ea09fa681 100644
--- a/tests/wpt/web-platform-tests/web-nfc/NDEFRecord_constructor.https.html
+++ b/tests/wpt/web-platform-tests/web-nfc/NDEFRecord_constructor.https.html
@@ -107,6 +107,7 @@
     assert_equals(record.recordType, 'text', 'recordType');
     assert_equals(record.mediaType, null, 'mediaType');
     assert_equals(record.id, test_record_id, 'id');
+    // By default, 'utf-8'.
     assert_equals(record.encoding, 'utf-8', 'encoding');
     assert_equals(record.lang, 'en', 'lang');
     const decoder = new TextDecoder();
@@ -123,6 +124,7 @@
     assert_equals(record.recordType, 'text', 'recordType');
     assert_equals(record.mediaType, null, 'mediaType');
     assert_equals(record.id, test_record_id, 'id');
+    // By default, 'utf-8'.
     assert_equals(record.encoding, 'utf-8', 'encoding');
     assert_equals(record.lang, 'en', 'lang');
     const decoder = new TextDecoder();
@@ -133,18 +135,32 @@
   }, 'NDEFRecord constructor with text record type and arrayBufferView data');
 
   test(() => {
+    assert_throws(new TypeError, () => new NDEFRecord(createTextRecord(
+            test_text_data, 'random-encoding')));
+    assert_throws(new TypeError, () => new NDEFRecord(createTextRecord(
+            test_text_data, 'utf-16')));
+    // Only 'utf-8' is OK for a DOMString data source.
+    const record = new NDEFRecord(createTextRecord(test_text_data, 'utf-8', 'fr'));
+    assert_equals(record.recordType, 'text', 'recordType');
+    assert_equals(record.encoding, 'utf-8', 'encoding');
+    assert_equals(record.lang, 'fr', 'lang');
+    const decoder = new TextDecoder();
+    assert_equals(decoder.decode(record.data), test_text_data,
+        'data has the same content with the original text');
+
+    assert_throws(new TypeError, () => new NDEFRecord(createTextRecord(
+            encodeTextToArrayBuffer(test_text_data, 'utf-8'), 'random-encoding')));
+    // The encoding list valid for a BufferSource data source.
     const encodings = ['utf-8', 'utf-16', 'utf-16be', 'utf-16le'];
     for (const encoding of encodings) {
-      const lang = 'fr';
-      const record = new NDEFRecord(createTextRecord(test_text_data, encoding, lang));
+      const record = new NDEFRecord(createTextRecord(encodeTextToArrayBuffer(
+              test_text_data, encoding), encoding, 'fr'));
       assert_equals(record.recordType, 'text', 'recordType');
-      assert_equals(record.mediaType, null, 'mediaType');
-    assert_equals(record.id, test_record_id, 'id');
       assert_equals(record.encoding, encoding, 'encoding');
-      assert_equals(record.lang, lang, 'lang');
-      const decoder = new TextDecoder();
+      assert_equals(record.lang, 'fr', 'lang');
+      const decoder = new TextDecoder(record.encoding);
       assert_equals(decoder.decode(record.data), test_text_data,
-          'data has the same content with the original dictionary');
+          'data has the same content with the original text. encoding: ' + encoding);
     }
   }, 'NDEFRecord constructor with text record type, encoding, and lang');
 
diff --git a/tests/wpt/web-platform-tests/web-nfc/NDEFWriter-document-hidden-manual.https.html b/tests/wpt/web-platform-tests/web-nfc/NDEFWriter-document-hidden-manual.https.html
index 2f291e51412..1a2839857bb 100644
--- a/tests/wpt/web-platform-tests/web-nfc/NDEFWriter-document-hidden-manual.https.html
+++ b/tests/wpt/web-platform-tests/web-nfc/NDEFWriter-document-hidden-manual.https.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <meta name="timeout" content="long">
-<title>NDEFWriter.push respect page visibility changes</title>
+<title>NDEFWriter.write respect page visibility changes</title>
 <link rel="help" href="https://w3c.github.io/web-nfc/#visible-document">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
@@ -10,7 +10,7 @@
 
 promise_test(async t => {
   const writer = new NDEFWriter();
-  const p1 = writer.push(test_text_data);
+  const p1 = writer.write(test_text_data);
 
   return await new Promise((resolve, reject) => {
     p1.then(() => {
@@ -20,7 +20,7 @@ promise_test(async t => {
       reject();
     });
   });
-}, "Test NDEFWriter.push operation should be suspend when document is not visible");
+}, "Test NDEFWriter.write operation should be suspend when document is not visible");
 
 </script>
 
diff --git a/tests/wpt/web-platform-tests/web-nfc/NDEFWriter_push.https.html b/tests/wpt/web-platform-tests/web-nfc/NDEFWriter_write.https.html
index 33a629781ed..e1224739f06 100644
--- a/tests/wpt/web-platform-tests/web-nfc/NDEFWriter_push.https.html
+++ b/tests/wpt/web-platform-tests/web-nfc/NDEFWriter_write.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
-<title>Web NFC: NDEFWriter.push Tests</title>
+<title>Web NFC: NDEFWriter.write Tests</title>
 <link rel="author" title="Intel" href="http://www.intel.com"/>
 <link rel="help" href="https://w3c.github.io/web-nfc/"/>
 <script src="/resources/testharness.js"></script>
@@ -16,11 +16,11 @@ const invalid_type_messages =
       undefined,
 
       // NDEFMessage.records: should have at least 1 valid record.
-      // https://w3c.github.io/web-nfc/#the-push-method - Step 8.
+      // https://w3c.github.io/web-nfc/#the-write-method - Step 8.
       createMessage([{}]),
 
       // NDEFMessageSource: not NDEF-formatable.
-      // https://w3c.github.io/web-nfc/#the-push-method - Step 8.
+      // https://w3c.github.io/web-nfc/#the-write-method - Step 8.
       createMessage([]),
 
       // https://w3c.github.io/web-nfc/#dfn-map-text-to-ndef
@@ -33,7 +33,7 @@ const invalid_type_messages =
 
       // NDEFRecord.encoding for 'text' record must be either "utf-8",
       // "utf-16", "utf-16le" or "utf-16be".
-      createMessage([createTextRecord(test_text_data, "chinese")]),
+      createMessage([createTextRecord(test_buffer_data, "chinese")]),
 
       // https://w3c.github.io/web-nfc/#dfn-map-a-url-to-ndef
       // NDEFRecord must have data.
@@ -109,7 +109,7 @@ promise_test(async t => {
   const promises = [];
   invalid_type_messages.forEach(message => {
     promises.push(
-      promise_rejects(t, new TypeError(), writer.push(message)));
+      promise_rejects(t, new TypeError(), writer.write(message)));
   });
   await Promise.all(promises);
 }, "Test that promise is rejected with TypeError if NDEFMessageSource is invalid.");
@@ -119,7 +119,7 @@ promise_test(async t => {
   const promises = [];
   invalid_syntax_messages.forEach(message => {
     promises.push(
-      promise_rejects(t, 'SyntaxError', writer.push(message)));
+      promise_rejects(t, 'SyntaxError', writer.write(message)));
   });
   await Promise.all(promises);
 }, "Test that promise is rejected with SyntaxError if NDEFMessageSource contains\
@@ -132,8 +132,8 @@ promise_test(async t => {
                                     location.origin, location.origin);
   }
   const writer = new NDEFWriter();
-  await promise_rejects(t, 'NotAllowedError', writer.push(test_text_data));
-}, 'NDEFWriter.push should fail if user permission is not granted.');
+  await promise_rejects(t, 'NotAllowedError', writer.write(test_text_data));
+}, 'NDEFWriter.write should fail if user permission is not granted.');
 
 // We do not provide NFC mock here to simulate that there has no available
 // implementation for NFC Mojo interface.
@@ -144,8 +144,8 @@ promise_test(async t => {
                                     location.origin, location.origin);
   }
   const writer = new NDEFWriter();
-  await promise_rejects(t, 'NotSupportedError', writer.push(test_text_data));
-}, 'NDEFWriter.push should fail if no implementation for NFC Mojo interface is available.');
+  await promise_rejects(t, 'NotSupportedError', writer.write(test_text_data));
+}, 'NDEFWriter.write should fail if no implementation for NFC Mojo interface is available.');
 
 nfc_test(async (t, mockNFC) => {
   const writer = new NDEFWriter();
@@ -153,7 +153,7 @@ nfc_test(async (t, mockNFC) => {
 
   //Make sure push is pending
   mockNFC.setPendingPushCompleted(false);
-  const p = writer.push(test_text_data, { signal: controller.signal });
+  const p = writer.write(test_text_data, { signal: controller.signal });
   const rejected = promise_rejects(t, 'AbortError', p);
   let callback_called = false;
   await new Promise(resolve => {
@@ -165,7 +165,7 @@ nfc_test(async (t, mockNFC) => {
   });
   await rejected;
   assert_true(callback_called, 'timeout should have caused the abort');
-}, "NDEFWriter.push should fail if abort push request before push happends.");
+}, "NDEFWriter.write should fail if abort write request before write happends.");
 
 promise_test(async t => {
   const writer = new NDEFWriter();
@@ -174,50 +174,50 @@ promise_test(async t => {
   controller.abort();
   assert_true(controller.signal.aborted);
   await promise_rejects(t, 'AbortError',
-      writer.push(test_text_data, { signal: controller.signal }));
-}, "NDEFWriter.push should fail if signal's aborted flag is set.");
+      writer.write(test_text_data, { signal: controller.signal }));
+}, "NDEFWriter.write should fail if signal's aborted flag is set.");
 
 promise_test(async t => {
   const writer = new NDEFWriter();
   const promises = [];
   invalid_signals.forEach(invalid_signal => {
     promises.push(promise_rejects(t, new TypeError(),
-        writer.push(test_text_data, { signal: invalid_signal })));
+        writer.write(test_text_data, { signal: invalid_signal })));
   });
   await Promise.all(promises);
-}, "NDEFWriter.push should fail if signal is not an AbortSignal.");
+}, "NDEFWriter.write should fail if signal is not an AbortSignal.");
 
 nfc_test(async (t, mockNFC) => {
   const writer1 = new NDEFWriter();
   const writer2 = new NDEFWriter();
   const controller = new AbortController();
-  const p1 = writer1.push(test_text_data, { signal: controller.signal });
+  const p1 = writer1.write(test_text_data, { signal: controller.signal });
 
-  // Even though push request is grantable,
+  // Even though write request is grantable,
   // this abort should be processed synchronously.
   controller.abort();
   await promise_rejects(t, 'AbortError', p1);
 
-  await writer2.push(test_text_data);
+  await writer2.write(test_text_data);
   assertNDEFMessagesEqual(test_text_data, mockNFC.pushedMessage());
 }, "Synchronously signaled abort.");
 
 nfc_test(async (t, mockNFC) => {
   const writer = new NDEFWriter();
   mockNFC.setHWStatus(NFCHWStatus.DISABLED);
-  await promise_rejects(t, 'NotReadableError', writer.push(test_text_data));
-}, "NDEFWriter.push should fail when NFC HW is disabled.");
+  await promise_rejects(t, 'NotReadableError', writer.write(test_text_data));
+}, "NDEFWriter.write should fail when NFC HW is disabled.");
 
 nfc_test(async (t, mockNFC) => {
   const writer = new NDEFWriter();
   mockNFC.setHWStatus(NFCHWStatus.NOT_SUPPORTED);
-  await promise_rejects(t, 'NotSupportedError', writer.push(test_text_data));
-}, "NDEFWriter.push should fail when NFC HW is not supported.");
+  await promise_rejects(t, 'NotSupportedError', writer.write(test_text_data));
+}, "NDEFWriter.write should fail when NFC HW is not supported.");
 
 promise_test(async t => {
   const writer = new NDEFWriter();
   await promise_rejects(
-    t, 'NotSupportedError', writer.push(new ArrayBuffer(32 * 1024 + 1)));
+    t, 'NotSupportedError', writer.write(new ArrayBuffer(32 * 1024 + 1)));
 }, "Reject promise with NotSupportedError if NFC message size exceeds 32KB.");
 
 promise_test(async () => {
@@ -243,7 +243,7 @@ promise_test(async () => {
                           };
                           try {
                             const writer = new NDEFWriter();
-                            writer.push("Test").then(onSuccess, onError);
+                            writer.write("Test").then(onSuccess, onError);
                           } catch(e) {
                             parent.postMessage("Failure", "*");
                           }
@@ -264,8 +264,8 @@ promise_test(async () => {
 
 nfc_test(async () => {
   const writer = new NDEFWriter();
-  await writer.push(test_text_data);
-}, 'NDEFWriter.push should succeed when NFC HW is enabled');
+  await writer.write(test_text_data);
+}, 'NDEFWriter.write should succeed when NFC HW is enabled');
 
 nfc_test(async (t, mockNFC) => {
   const writer = new NDEFWriter();
@@ -277,10 +277,10 @@ nfc_test(async (t, mockNFC) => {
                                createUrlRecord(test_url_data, true),
                                createRecord('w3.org:xyz', test_buffer_data)],
                                test_message_origin);
-  await writer.push(message);
+  await writer.write(message);
   assertNDEFMessagesEqual(message, mockNFC.pushedMessage());
-}, "NDEFWriter.push NDEFMessage containing text, mime, unknown, url, absolute-url \
-and external records with default NDEFPushOptions.");
+}, "NDEFWriter.write NDEFMessage containing text, mime, unknown, url, absolute-url \
+and external records with default NDEFWriteOptions.");
 
 nfc_test(async (t, mockNFC) => {
   const payloadMessage = createMessage([createTextRecord(test_text_data)]);
@@ -289,7 +289,7 @@ nfc_test(async (t, mockNFC) => {
           payloadMessage)]);
 
   const writer = new NDEFWriter();
-  await writer.push(message);
+  await writer.write(message);
   const pushed_message = mockNFC.pushedMessage();
 
   // The mojom message received by mock nfc contains only the external type record.
@@ -299,48 +299,48 @@ nfc_test(async (t, mockNFC) => {
   assert_array_equals(pushed_message.data[0].data, new Uint8Array(0),
       'payloadMessage is used instead');
   assertNDEFMessagesEqual(payloadMessage, pushed_message.data[0].payloadMessage);
-}, "NDEFWriter.push NDEFMessage containing embedded records.");
+}, "NDEFWriter.write NDEFMessage containing embedded records.");
 
 nfc_test(async (t, mockNFC) => {
   const writer = new NDEFWriter();
-  await writer.push(test_text_data);
+  await writer.write(test_text_data);
   assertNDEFMessagesEqual(test_text_data, mockNFC.pushedMessage());
-}, "Test that NDEFWriter.push succeeds when message is DOMString.");
+}, "Test that NDEFWriter.write succeeds when message is DOMString.");
 
 nfc_test(async (t, mockNFC) => {
   const writer = new NDEFWriter();
-  await writer.push(test_buffer_data);
+  await writer.write(test_buffer_data);
   assertNDEFMessagesEqual(test_buffer_data, mockNFC.pushedMessage());
-}, "Test that NDEFWriter.push succeeds when message is ArrayBuffer.");
+}, "Test that NDEFWriter.write succeeds when message is ArrayBuffer.");
 
 nfc_test(async (t, mockNFC) => {
   let buffer_view = new Uint8Array(test_buffer_data, 2, 5);
   const writer = new NDEFWriter();
-  await writer.push(buffer_view);
+  await writer.write(buffer_view);
   assertNDEFMessagesEqual(buffer_view, mockNFC.pushedMessage());
-}, "Test that NDEFWriter.push succeeds when message is ArrayBufferView.");
+}, "Test that NDEFWriter.write succeeds when message is ArrayBufferView.");
 
 nfc_test(async (t, mockNFC) => {
   const writer = new NDEFWriter();
-  await writer.push(createMessage([createRecord('empty')]));
+  await writer.write(createMessage([createRecord('empty')]));
   const receivedMessage = mockNFC.pushedMessage();
   assert_equals(receivedMessage.data.length, 1);
   assert_equals(receivedMessage.data[0].recordType, 'empty', 'recordType');
-}, "NDEFWriter.push with 'empty' record should succeed.");
+}, "NDEFWriter.write with 'empty' record should succeed.");
 
 nfc_test(async (t, mockNFC) => {
   const writer = new NDEFWriter();
-  await writer.push(test_text_data);
-  assertNDEFPushOptionsEqual(createNDEFPushOptions(true),
-                            mockNFC.pushOptions());
-}, "Check that default NDEFPushOptions values are correctly set.");
+  await writer.write(test_text_data);
+  assertNDEFWriteOptionsEqual(createNDEFWriteOptions(true),
+                            mockNFC.writeOptions());
+}, "Check that default NDEFWriteOptions values are correctly set.");
 
 nfc_test(async (t, mockNFC) => {
   const writer = new NDEFWriter();
-  let ndefPushOptions = createNDEFPushOptions(false);
-  await writer.push(test_text_data, ndefPushOptions);
-  assertNDEFPushOptionsEqual(ndefPushOptions, mockNFC.pushOptions());
-}, "Check that provided NDEFPushOptions values are correctly converted.");
+  let ndefWriteOptions = createNDEFWriteOptions(false);
+  await writer.write(test_text_data, ndefWriteOptions);
+  assertNDEFWriteOptionsEqual(ndefWriteOptions, mockNFC.writeOptions());
+}, "Check that provided NDEFWriteOptions values are correctly converted.");
 
 nfc_test(async (t, mockNFC) => {
   const reader = new NDEFReader();
@@ -350,7 +350,7 @@ nfc_test(async (t, mockNFC) => {
   await reader.scan({ signal: controller.signal });
 
   const writer = new NDEFWriter();
-  await writer.push(test_text_data, { ignoreRead: false });
+  await writer.write(test_text_data, { ignoreRead: false });
   assertNDEFMessagesEqual(test_text_data, mockNFC.pushedMessage());
 
   mockNFC.setReadingMessage(message);
@@ -359,29 +359,29 @@ nfc_test(async (t, mockNFC) => {
     assertWebNDEFMessagesEqual(event.message, new NDEFMessage(message));
   });
 
-}, "NDEFWriter.push should read data when ignoreRead is false.");
+}, "NDEFWriter.write should read data when ignoreRead is false.");
 
 nfc_test(async (t, mockNFC) => {
   const reader = new NDEFReader();
   const message = createMessage([createTextRecord(test_text_data)]);
-  // Ignore reading if NDEFPushOptions.ignoreRead is true
+  // Ignore reading if NDEFWriteOptions.ignoreRead is true
   reader.onreading = t.unreached_func("reading event should not be fired.");
   await reader.scan();
 
   const writer = new NDEFWriter();
-  await writer.push(test_text_data, { ignoreRead: true });
+  await writer.write(test_text_data, { ignoreRead: true });
   mockNFC.setReadingMessage(message);
   assertNDEFMessagesEqual(test_text_data, mockNFC.pushedMessage());
-}, "NDEFWriter.push should ignore reading data when ignoreRead is true.");
+}, "NDEFWriter.write should ignore reading data when ignoreRead is true.");
 
 nfc_test(async (t, mockNFC) => {
   const writer1 = new NDEFWriter();
   const writer2 = new NDEFWriter();
 
-  const ndefPushOptions1 = createNDEFPushOptions(false);
-  const ndefPushOptions2 = createNDEFPushOptions(true);
-  const p1 = writer1.push(test_text_data, ndefPushOptions1);
-  const p2 = writer2.push(test_url_data, ndefPushOptions2);
+  const ndefWriteOptions1 = createNDEFWriteOptions( false);
+  const ndefWriteOptions2 = createNDEFWriteOptions(true);
+  const p1 = writer1.write(test_text_data, ndefWriteOptions1);
+  const p2 = writer2.write(test_url_data, ndefWriteOptions2);
 
   await new Promise((resolve, reject) => {
     // Make first push pending
@@ -394,16 +394,16 @@ nfc_test(async (t, mockNFC) => {
     });
     p2.then(() => {
       assertNDEFMessagesEqual(test_url_data, mockNFC.pushedMessage());
-      assertNDEFPushOptionsEqual(ndefPushOptions2, mockNFC.pushOptions());
+      assertNDEFWriteOptionsEqual(ndefWriteOptions2, mockNFC.writeOptions());
       assert_equals(err, "AbortError", "the pending push should be aborted");
       resolve();
     });
   });
-}, "NDEFWriter.push should replace all previously configured push operations.");
+}, "NDEFWriter.write should replace all previously configured write operations.");
 
 nfc_test(async (t, mockNFC) => {
   const writer = new NDEFWriter();
-  await writer.push({ records: [{ recordType: "mime", data: test_buffer_data }] });
+  await writer.write({ records: [{ recordType: "mime", data: test_buffer_data }] });
   assertNDEFMessagesEqual(test_buffer_data, mockNFC.pushedMessage());
 }, "Test that mediaType should be set to 'application/octet-stream' if \
 NDEFRecordInit.record's recordType is 'mime' and NDEFRecordInit.record's \
@@ -414,45 +414,45 @@ nfc_test(async (t, mockNFC) => {
   mockNFC.setPendingPushCompleted(false);
 
   const writer = new NDEFWriter();
-  const promise = writer.push(test_text_data);
+  const promise = writer.write(test_text_data);
 
-  // Just to make sure the push() request has already reached to the mock.
+  // Just to make sure the write() request has already reached to the mock.
   const reader = new NDEFReader();
   await reader.scan();
 
   mockNFC.simulateNonNDEFTagDiscovered();
   await promise_rejects(t, 'NotSupportedError', promise);
-}, "NDEFWriter.push should fail when the NFC device coming up does not expose \
+}, "NDEFWriter.write should fail when the NFC device coming up does not expose \
 NDEF technology.");
 
 nfc_test(async (t, mockNFC) => {
   const writer = new NDEFWriter();
-  await writer.push(test_text_data, { overwrite: false });
+  await writer.write(test_text_data, { overwrite: false });
   assertNDEFMessagesEqual(test_text_data, mockNFC.pushedMessage());
-}, "NDEFWriter.push should succeed to push data to an unformatted NFC device \
-when the NDEFPushOptions.overwrite is false.");
+}, "NDEFWriter.write should succeed to write data to an unformatted NFC device \
+when the NDEFWriteOptions.overwrite is false.");
 
 nfc_test(async (t, mockNFC) => {
   const writer = new NDEFWriter();
-  await writer.push(test_buffer_data);
+  await writer.write(test_buffer_data);
   assertNDEFMessagesEqual(test_buffer_data, mockNFC.pushedMessage());
-  await writer.push(test_text_data, { overwrite: true });
+  await writer.write(test_text_data, { overwrite: true });
   assertNDEFMessagesEqual(test_text_data, mockNFC.pushedMessage());
-}, "NDEFWriter.push should succeed to overwrite the existing data \
-when the NDEFPushOptions.overwrite is true.");
+}, "NDEFWriter.write should succeed to overwrite the existing data \
+when the NDEFWriteOptions.overwrite is true.");
 
 nfc_test(async (t, mockNFC) => {
   const writer = new NDEFWriter();
-  const p = writer.push(test_text_data, { overwrite: false });
+  const p = writer.write(test_text_data, { overwrite: false });
   mockNFC.setIsFormattedTag(true);
   await promise_rejects(t, 'NotAllowedError', p);
-}, "NDEFWriter.push should fail when there are NDEF records on the NFC device \
-and NDEFPushOptions.overwrite is false.");
+}, "NDEFWriter.write should fail when there are NDEF records on the NFC device \
+and NDEFWriteOptions.overwrite is false.");
 
 nfc_test(async (t, mockNFC) => {
   const writer = new NDEFWriter();
   mockNFC.simulateDataTransferFails();
-  await promise_rejects(t, 'NetworkError', writer.push(test_text_data));
-}, "NDEFWriter.push should fail with NetworkError when NFC data transfer fails.");
+  await promise_rejects(t, 'NetworkError', writer.write(test_text_data));
+}, "NDEFWriter.write should fail with NetworkError when NFC data transfer fails.");
 
 </script>
diff --git a/tests/wpt/web-platform-tests/web-nfc/README.md b/tests/wpt/web-platform-tests/web-nfc/README.md
index c4efc02ff2a..15c6534a7be 100644
--- a/tests/wpt/web-platform-tests/web-nfc/README.md
+++ b/tests/wpt/web-platform-tests/web-nfc/README.md
@@ -15,7 +15,7 @@ The `WebNFCTest` interface is defined as:
     setReadingMessage(NDEFMessageInit message); // Sets message that is used to deliver NFC reading updates.
     setPendingPushCompleted(boolean result); // Sets if the pending push is completed.
     pushedMessage(); // Gets the pushed `NDEFMessageSource`.
-    pushOptions(); // Gets the pushed `NDEFPushOptions`.
+    writeOptions(); // Gets the pushed `NDEFWriteOptions`.
     simulateNonNDEFTagDiscovered(); // Simulates that the NFC device discovered does not expose NDEF technology.
     setIsFormattedTag(boolean isFormatted); // Sets if the NFC tag has formatted NDEF message.
   };
diff --git a/tests/wpt/web-platform-tests/web-nfc/resources/nfc-helpers.js b/tests/wpt/web-platform-tests/web-nfc/resources/nfc-helpers.js
index 45bfa6deced..5bec071dfa7 100644
--- a/tests/wpt/web-platform-tests/web-nfc/resources/nfc-helpers.js
+++ b/tests/wpt/web-platform-tests/web-nfc/resources/nfc-helpers.js
@@ -74,6 +74,33 @@ NFCHWStatus.NOT_SUPPORTED = NFCHWStatus.ENABLED + 1;
 // OS-level NFC setting OFF
 NFCHWStatus.DISABLED = NFCHWStatus.NOT_SUPPORTED + 1;
 
+function encodeTextToArrayBuffer(string, encoding) {
+  // Only support 'utf-8', 'utf-16', 'utf-16be', and 'utf-16le'.
+  assert_true(
+      encoding === 'utf-8' || encoding === 'utf-16' ||
+      encoding === 'utf-16be' || encoding === 'utf-16le');
+
+  if (encoding === 'utf-8') {
+    return new TextEncoder().encode(string).buffer;
+  }
+
+  if (encoding === 'utf-16') {
+    let uint16array = new Uint16Array(string.length);
+    for (let i = 0; i < string.length; i++) {
+      uint16array[i] = string.codePointAt(i);
+    }
+    return uint16array.buffer;
+  }
+
+  const littleEndian = encoding === 'utf-16le';
+  const buffer = new ArrayBuffer(string.length * 2);
+  const view = new DataView(buffer);
+  for (let i = 0; i < string.length; i++) {
+    view.setUint16(i * 2, string.codePointAt(i), littleEndian);
+  }
+  return buffer;
+}
+
 function createMessage(records) {
   if (records !== undefined) {
     let message = {};
@@ -125,12 +152,12 @@ function createUrlRecord(url, isAbsUrl) {
   return createRecord('url', url, test_record_id);
 }
 
-function createNDEFPushOptions(ignoreRead) {
+function createNDEFWriteOptions(ignoreRead) {
   return {ignoreRead};
 }
 
 // Compares NDEFMessageSource that was provided to the API
-// (e.g. NDEFWriter.push), and NDEFMessage that was received by the
+// (e.g. NDEFWriter.write), and NDEFMessage that was received by the
 // mock NFC service.
 function assertNDEFMessagesEqual(providedMessage, receivedMessage) {
   // If simple data type is passed, e.g. String or ArrayBuffer or
diff --git a/tests/wpt/web-platform-tests/webrtc-identity/idlharness.https.window.js b/tests/wpt/web-platform-tests/webrtc-identity/idlharness.https.window.js
index da1cb85a8e7..8c7bf665ef6 100644
--- a/tests/wpt/web-platform-tests/webrtc-identity/idlharness.https.window.js
+++ b/tests/wpt/web-platform-tests/webrtc-identity/idlharness.https.window.js
@@ -5,7 +5,7 @@
 
 idl_test(
   ['webrtc-identity'],
-  ['webrtc', 'mediacapture-streams', 'html', 'dom'],
+  ['webrtc', 'mediacapture-streams', 'html', 'dom', 'WebIDL'],
   async idlArray => {
     idlArray.add_objects({
       RTCPeerConnection: [`new RTCPeerConnection()`],
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-createOffer.html b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-createOffer.html
index c56d45280ef..bfd27df3e68 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-createOffer.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-createOffer.html
@@ -49,7 +49,7 @@
 
     return generateVideoReceiveOnlyOffer(pc)
     .then(offer =>
-      pc.setLocalDescription(offer)
+       pc.setLocalDescription(offer)
       .then(() => {
         assert_equals(pc.signalingState, 'have-local-offer');
         assert_session_desc_similar(pc.localDescription, offer);
@@ -94,6 +94,26 @@
   }, 'When media stream is added when createOffer() is running in parallel, the result offer should contain the new media stream');
 
   /*
+  If connection's signaling state is neither "stable" nor "have-local-offer", return a promise rejected with a newly created InvalidStateError.
+  */
+  promise_test(t => {
+    const pc = new RTCPeerConnection();
+    t.add_cleanup(() => pc.close());
+
+    const states = [];
+    pc.addEventListener('signalingstatechange', () => states.push(pc.signalingState));
+
+    return generateVideoReceiveOnlyOffer(pc)
+    .then(offer =>
+       pc.setRemoteDescription(offer)
+       .then(() => {
+          assert_equals(pc.signalingState, 'have-remote-offer');
+          return promise_rejects(t, 'InvalidStateError',
+             pc.createOffer());
+       })
+     )
+  }, 'createOffer() should fail when signaling state is not stable or have-local-offer');
+  /*
    *  TODO
    *  4.3.2 createOffer
    *    3.  If connection is configured with an identity provider, and an identity